coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
31,164 Commits 9 Branches 11 Tags
dbd01d8a43e0967ffd7bb17cd910238df8753fb9
Commit Graph

24890 Commits

Author SHA1 Message Date
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
AnturK b31c6f1e15 Adds friendly fire check for some ranged hostile mobs 2016-01-17 15:54:24 +01:00
AnturK 038a947c9c Fixes MMI custom emotes 2016-01-17 15:49:01 +01: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 bf45d4c1e2 Blobbernnauts can now see in the dark. 2016-01-16 22:06:25 -05: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
Firecage 754491ce4c Changes relatives paths into absolute paths and makes some if()'s better 2016-01-17 01:36:56 +02: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
Bjorn Neergaard f26f6189c7 Inline style/theme once again; fix titlebar color 2016-01-16 12:13:39 -06:00
NullQuery c07bde77be Default implementation of interact to call ui_interact. 2016-01-16 18:53:45 +01:00
NullQuery c1cab5f74d Modify attack_hand for machinery to call the interact proc upon a successful click. 2016-01-16 18:45:52 +01:00
xxalpha 2cc55c3ba0 Changed floor ex_act to not break grilles & src if under r-windows. 2016-01-16 17:43:33 +00:00
NullQuery ea90109cea Directions have been given on how to proceed. 
Underestimated the code style of this branch.
Now I've fixed it.
Clearly I was mistaken.
Forgive my mistakes.
Once upon a time...
Really, a long time ago.
Certain decisions were made.
Everyone agreed at the time.
Some didn't.
Maybe we could change the standard.
Eh, let's not.
 2016-01-16 17:50:25 +01:00
Razharas 36f0daa071 Makes SMES drain cells on deconstruction 
Makes SMES drain cells on deconstruction
Fixes https://github.com/tgstation/-tg-station/issues/6451
 2016-01-16 19:38:35 +03:00
Razharas f0aa442dc7 Makes turrets shoot rollerbedded things 
Makes turrets shoot rollerbedded things fixes #6168
 2016-01-16 18:58:44 +03:00
Kyle Spier-Swenson 3467c3f61a Some wrapper code. 2016-01-16 07:26:01 -08:00
Kyle Spier-Swenson bf529e2ea5 You can now control click on turfs. 2016-01-16 07:20:55 -08:00
NullQuery 75652783ae Remove unnecessary comment in favor of Git blame feature. 
Fixes #14599
 2016-01-16 16:13:50 +01:00
Aranclanos ef12dc0ea5 Merge pull request #14635 from Razharas/SHutterFix 
Fixes c4 not working on shutters
 2016-01-16 11:54:25 -03:00
Menshin 828c1ddf2c * Generalized AStar check for objects preventing passability 
* Fixed AStar not detecting plastic flaps as impassable for mobs that can't pass them (fixes #14616)
 2016-01-16 15:27:31 +01:00
NullQuery 618372a111 Call check_shields when attacked by an abductor baton. 2016-01-16 11:28:06 +01:00
Kyle Spier-Swenson 1cdc33cdef HOLY FUCKING SHIT, WHAT THE FUCK IS THAT. 2016-01-15 21:47:36 -08:00
Nerd Lord 3f2bcdb25b Fixes an old as fuck bug where the malfhack var wasn't set on APCs hacked by malf AIs. 2016-01-15 23:55:51 -05:00
Buggy123 f90d3d0144 Escape pod safes now contain red oxygen tanks instead of air mix tanks. 2016-01-15 23:31:46 -05:00
Buggy123 157af1d006 Broken bottles are now the same size as unbroken bottles. 2016-01-15 22:14:18 -05:00