coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
23,886 Commits 9 Branches 11 Tags
815ef798e92cfc788b4e6bf73802ebe0c554e8a3
Commit Graph

5834 Commits

Author SHA1 Message Date
Aranclanos 815ef798e9 Fixes the last remaining associative lists from pipes 2015-09-12 20:57:16 -03:00
Razharas 3a63c31614 Merge pull request #11626 from Memendia/master 
Suicide txt fix
 2015-09-11 14:16:30 +03:00
Razharas 45fb337732 Merge pull request #11487 from bgobandit/matsblastusa 
Adds materials to some items for recycling purposes.
 2015-09-11 14:03:18 +03:00
Razharas f3ae87756c Merge pull request #11649 from Firecage/bucklingtext 
Fixes the buckling message.
 2015-09-11 04:03:40 +03:00
bgobandit b3b9941432 Merge branch 'master' of https://github.com/tgstation/-tg-station into matsblastusa 
Conflicts:
	code/modules/assembly/flash.dm
 2015-09-09 14:04:41 -04:00
Firecage bdc9b792f7 buckling text span fix. 2015-09-09 09:29:51 +02:00
Razharas 161156cffc Merge pull request #11585 from bgobandit/legitposters 
Poster changes!
 2015-09-09 02:38:56 +03:00
Firecage 812f5b4094 Fixes the buckling message. 2015-09-07 23:52:30 +02:00
bgobandit 2cee8c85dc Reworks the poster lists per cheridan 2015-09-07 12:18:06 -04:00
Razharas 9f0f1a9234 Merge pull request #11531 from RemieRichards/Bloody_footprints 
Bloody footprints!
 2015-09-07 16:07:03 +03:00
Remie Richards 27f33581d2 Merge pull request #11518 from xxalpha/xenoweedspread 
Changed weed spread to be like gas spread.
 2015-09-07 13:51:52 +01:00
bgobandit 72ac379bbf henk 2015-09-07 07:18:58 -04:00
Memendia 046b7fbad3 I told ya 2015-09-07 03:40:07 -07:00
bgobandit fd5e854118 IF TRAVIS DOES NOT WORK AFTER THIS I SWEAR TO CLOWN 2015-09-06 14:02:10 -04:00
bgobandit c5984f4359 Merge branch 'master' of https://github.com/tgstation/-tg-station into legitposters 
Conflicts:
	_maps/map_files/MetaStation/MetaStation.v41G.dmm
 2015-09-06 13:27:51 -04:00
Razharas 93b9f96cfa Merge pull request #11341 from bgobandit/suicideisnotajoke 
Adds/tweaks several suicide messages.
 2015-09-06 06:42:00 +03:00
Razharas 3847e06903 Merge pull request #11594 from Xhuis/the_poltergeistening 
Fixes being unable to buckle into chairs and beds
 2015-09-06 06:33:32 +03:00
Xhuis d7ffc1bd7e Removes some commented code and fixes a typo 2015-09-05 14:43:12 -04:00
Xhuis 1f4313f7ad Fixes buckling 2015-09-05 14:41:08 -04:00
Cheridan cbe2e310c6 Merge pull request #11573 from Fox-McCloud/plasmagold 
Fixes Gold Sheets Containing Plasma
 2015-09-05 11:54:34 -05:00
bgobandit 362157a5d5 t y p o h o n k 2015-09-04 22:21:51 -04:00
bgobandit 5cbe9e17e2 TRAVIS NOW COMPILES. 2015-09-04 19:17:51 -04:00
bgobandit b9e779dc54 Makes Travis compile hopefully. 2015-09-04 19:13:51 -04:00
bgobandit 261494e659 Made some changes and repathing for posters. 2015-09-04 18:30:58 -04:00
c0 df7386a4ec Assemblies update 2015-09-04 11:22:37 +03:00
Fox-McCloud 0b8f2476b4 Fixes Gold Sheets Containing Plasma 2015-09-04 01:44:13 -04:00
bgobandit 1748a8c261 ADDS EXTRA HONK 2015-09-03 14:34:53 -04:00
Razharas 2ab0836d6e Just some tiny fix 
Just some tiny fix
Move along codizen
 2015-09-03 11:59:47 +03:00
Razharas 8430304fdc Merge branch 'master' of https://github.com/tgstation/-tg-station into GhostBuckle 2015-09-03 11:42:09 +03:00
Razharas c28cae5d83 Use topic instead of old shit 
Use topic instead of old shit
 2015-09-03 11:41:12 +03:00
bgobandit ca34015b85 Removes minibomb suicide message. Fixes wand suicide message. 2015-09-02 23:07:40 -04:00
Aranclanos d2903d077f Merge pull request #11530 from xxalpha/coilcablecorrection 
Fixed a couple of bugs with cable coils.
 2015-09-02 22:55:47 -03:00
xxalpha 3e3767c1d0 Tweak 2015-09-02 12:43:39 +01:00
xxalpha f72ecc6fa1 Merge remote-tracking branch 'upstream/master' into xenoweedspread 2015-09-02 12:42:35 +01:00
Razharas fc053aee12 Fixes ghost bucking 
Fixes ghost bucking
 2015-09-02 07:50:39 +03:00
palpatine213 00f01159b1 Fixes Merge conflicts 2015-09-01 19:46:30 -07:00
Remie Richards ff07337841 Bloody footprints! Human blood, Xeno blood, and Oil can now produce bloody footprints that fade off as the blood on the shoe fades. Affects gibs too. 2015-09-02 01:32:02 +01:00
xxalpha 70d97ad5e4 Fixed a couple of bugs with cable coils. 2015-09-01 22:35:04 +01:00
Razharas 33ff21393d Merge pull request #11495 from Anonus/stopbombingtheblob 
Blob is now much more resistant to explosions.
 2015-09-01 18:37:33 +03:00
Razharas ad9fa24d5f Merge pull request #11515 from xxalpha/PLmD_69pXpk 
Tweaked foam spread logic, foam layer.
 2015-09-01 18:33:22 +03:00
Razharas 72610973cc Merge pull request #11427 from xxalpha/magborg 
Gave engineering cyborgs permanent magboots effect.
 2015-09-01 17:31:15 +03:00
Razharas 9d6ce85e9a Merge pull request #11414 from Xhuis/shadowling_update_4 
Shadowling Update IV
 2015-09-01 17:19:07 +03:00
Razharas bfbe4e997e Merge pull request #11505 from duncathan/returnQDEL_HINT_LETMEDIE 
Makes all Destroy() procs return properly
 2015-09-01 15:54:18 +03:00
Razharas 6464aafa7c Merge pull request #11494 from Aranclanos/PDAqdel 
Fixes PDAs being able to send messages to other PDAs in the qdel queue
 2015-09-01 15:53:26 +03:00
Razharas 30ac2634f4 Merge pull request #11250 from GunHog/Malf_RCD-defense 
Buffs RCD Disable Malfunction ability
 2015-09-01 11:50:17 +03:00
Razharas b2654acec5 Merge pull request #11247 from xxalpha/airlocking 
Airlock Overlays
 2015-09-01 11:49:05 +03:00
duncathan 1f5510eb12 hahah woops 2015-09-01 02:16:12 -06:00
Razharas bf85a525e7 Merge pull request #11071 from PatchouliKnowledge/ayycidlockers 
Lockers dump their contents if molten by alien acid
 2015-09-01 10:58:10 +03:00
Razharas 446e784017 Merge pull request #11318 from kingofkosmos/borgdedcoverunlock_aidedunanchor 
Cyborgs unlocking cover and AI unanchoring upon dying.
 2015-09-01 10:08:08 +03:00
Razharas e18032c87a Merge pull request #11411 from Xhuis/help_xenos_in_medbay_maint 
MEGA Toys presents: Xenos Isolated action figure!
 2015-09-01 09:58:15 +03:00