coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
29,044 Commits 9 Branches 11 Tags
50ce22e5ecff7f5b4f1e5cdcdb5f33b5ab72c19e
Commit Graph

23195 Commits

Author SHA1 Message Date
Bjorn Neergaard 50ce22e5ec Fix air alarm environmental thresholds 2016-01-18 14:21:59 -06:00
Bjorn Neergaard 4fe38b328b Have air alarms support all gasses 2016-01-18 14:21:57 -06:00
Bjorn Neergaard 1c64360882 tgui atmos control computers 2016-01-18 14:21:57 -06:00
Bjorn Neergaard 0a7236d955 Allow relabeling any canister; port MULEbot to tgui 2016-01-18 14:21:56 -06:00
Razharas afccde250c Further corrections to smeses 
Further corrections to smeses
 2016-01-18 17:10:35 +03:00
Razharas c71c01f4e9 Roundstart smes fix 
Roundstart smes fix
 2016-01-18 17:00:30 +03:00
tkdrg ace569e951 Merge pull request #14678 from Buggy123/patch-9 
Fixes energy ball Destroy()
 2016-01-17 22:05:03 -03:00
tkdrg 4e0e763cff Merge pull request #14677 from Buggy123/patch-8 
Reflectors now give back the materials used to construct it when deconstructed.
 2016-01-17 22:01:21 -03:00
tkdrg 4de5320c5a Merge pull request #14674 from Buggy123/patch-7 
Reinforced floors no longer burn away under extremely high temperatures.
 2016-01-17 18:47:03 -03:00
tkdrg 0ba3fdc3f2 Merge pull request #14675 from Razharas/BloodFix 
Makes some species disease immune
 2016-01-17 18:45:45 -03:00
tkdrg 4d3b4d8e47 Merge pull request #14684 from Buggy123/patch-11 
Adds detonation tracking to grenades.
 2016-01-17 18:31:27 -03:00
tkdrg 9212e0027a Merge pull request #14673 from Razharas/MalfFix 
Fixes malf turret cover abuse
 2016-01-17 18:18:55 -03:00
Buggy123 4da17c198b Never 2016-01-17 16:07:20 -05:00
Razharas c2730f6340 Grammar fix 
Grammar fix
 2016-01-17 23:33:36 +03:00
tkdrg fa8cc5cd12 Merge pull request #14669 from xxalpha/shingles 
Objects under rwindows don't break.
 2016-01-17 17:30:57 -03:00
tkdrg f3b77aab73 Merge pull request #14672 from tgstation/duncathan-patch-1 
volume pumps respect their transfer rate
 2016-01-17 17:29:14 -03:00
xxalpha 6d56fafa1c fasdasdjaidfhasiufh 
conflix

fuck that

mistake

Clearer if
 2016-01-17 20:14:02 +00:00
Buggy123 84ba5cad1f Added tracking for who last touched the grenade, and corrected grammar. 2016-01-17 14:44:39 -05:00
tkdrg 4ed6ea1431 Merge pull request #14668 from nullstation/machinery_interact 
Modify attack_hand for machinery to call the interact proc upon a suc…
 2016-01-17 15:21:15 -03:00
duncathan salt 9fdbc32512 Merge pull request #14663 from Razharas/TurretFix 
Makes turrets shoot rollerbedded things
 2016-01-17 10:10:43 -06:00
duncathan salt 24784b8283 Merge pull request #14666 from Razharas/SMESfix 
Makes SMES drain cells on deconstruction
 2016-01-17 10:07:16 -06:00
tkdrg 6fab2e82d8 Merge pull request #14662 from MrStonedOne/patch-127 
Fixes control click to unpull not working with turfs.
 2016-01-17 11:57:55 -03:00
Razharas a2ecfc0fc4 Merge pull request #14405 from Kole6738/patch-4 
Prevent flipping a coin if wired
 2016-01-17 15:46:08 +03:00
Razharas 28ac3268d1 Merge pull request #14660 from Menshin/flappyflaps 
Generalized CanAStarPass() to all /obj
 2016-01-17 15:33:39 +03:00
Razharas 4a9ef86808 Merge pull request #14653 from ChangelingRain/malfhack 
Fixes a bug where malf hacked apcs couldn't be fixed with an apc frame
 2016-01-17 15:30:25 +03:00
Razharas db9f8b3364 Merge pull request #14640 from bear1ake/some-fixes 
Fixes #13811
 2016-01-17 15:27:54 +03:00
Razharas 596557a6f2 Merge pull request #14639 from ChangelingRain/retrocures 
Fixes a number of diseases being impossible to cure
 2016-01-17 15:26:44 +03:00
Razharas d5b943e4f2 Merge pull request #14638 from AnturK/alertfix 
Alert Fix
 2016-01-17 15:26:00 +03:00
NullQuery 4a78a3f4f2 2 changes: 
- Remove duplicate add_fingerprint
- Apply fix suggested by neersighted
 2016-01-17 11:52:03 +01:00
Razharas 885456db1d Merge pull request #14648 from Buggy123/patch-6 
Broken bottles are now the same size as unbroken bottles.
 2016-01-17 12:35:55 +03:00
Razharas b08060e55b Merge pull request #14652 from Buggy123/podtankfix 
The escape pod emergency safes now contain oxygen tanks instead of air mix tanks
 2016-01-17 12:35:11 +03:00
Razharas f982fa5327 Merge pull request #14655 from MrStonedOne/patch-126 
HOLY FUCKING SHIT, WHAT THE FUCK IS THAT.
 2016-01-17 12:34:20 +03:00
Razharas 61fadf75ad Makes species with funky blood virusimmune 
Makes species with funky blood virusimmune
 2016-01-17 12:28:16 +03:00
Razharas c9c13e4f33 Revert "Makes some species disease immune" 
This reverts commit b2049f008a.
 2016-01-17 12:24:03 +03:00
Buggy123 bed2037840 Adds detonation tracking to grenades. 2016-01-16 21:58:20 -05:00
Buggy123 52879ba052 Fixes energy ball Destroy() 2016-01-16 19:00:39 -05:00
Buggy123 c3257ff8fb Corrected syntax error 2016-01-16 18:19:06 -05:00
Buggy123 01cb4cb340 Reflectors now give back the materials used to construct it when deconstructed. 2016-01-16 18:12:40 -05:00
Buggy123 87c82007f2 Uses infinity instead of a really large number. 2016-01-16 17:19:11 -05:00
Razharas b2049f008a Makes some species disease immune 
Makes some species disease immune
Fixes https://github.com/tgstation/-tg-station/issues/7775
 2016-01-17 00:45:41 +03:00
Buggy123 3b4c7003a2 Reinforced floors no longer burn away under extremely high temperatures. 2016-01-16 16:25:11 -05:00
Razharas b8cde5c6cb Fixes malf turret cover abuse 
Fixes malf turret cover abuse
Fixes https://github.com/tgstation/-tg-station/issues/7617
 2016-01-16 22:53:39 +03:00
duncathan salt eafb93bb2f fixes #14671 2016-01-16 13:52:01 -06:00
Razharas 1b008f874c Forgot some parentseses 
Forgot some parentseses
 2016-01-16 22:39:17 +03:00
bear1ake 760fc8a5aa Merge remote-tracking branch 'refs/remotes/tgstation/master' into some-fixes 
# Conflicts:
#	code/ATMOSPHERICS/components/trinary_devices/filter.dm
 2016-01-17 03:44:04 +09:00
xxalpha e4150ac88e Merge remote-tracking branch 'upstream/master' into shingles 2016-01-16 18:37:40 +00:00
xxalpha 6ff3817a89 Repath windows (oh god), nerf normal windows ex_act. 2016-01-16 18:27:16 +00:00
Kyle Spier-Swenson e6036789dd Simple compile error fix 2016-01-16 10:20:38 -08:00
Bjorn Neergaard b95a58c8fb Repath canisters; make label code create a new can; use es6 function shorthand 
By making a new canister when relabeled, we can make the name/desc identical to a
mapped canister, and remove hacky snowflake code
 2016-01-16 12:13:51 -06:00
Bjorn Neergaard 5c1fd9c85b Fix JS/CSS watchers, fix listmos/tgui bugs 2016-01-16 12:13:50 -06:00