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

14295 Commits

Author SHA1 Message Date
phil235 e5a6113157 Merge pull request #14354 from Arquebusier/eggfix 
Eggfixv2
 2016-01-08 14:31:31 +01:00
duncathan salt 0757495543 Merge pull request #14416 from AnturK/mostcriticalbug 
Fixes Ian wearing deathsquad suit
 2016-01-08 07:20:15 -06:00
duncathan salt 249bda699c Merge pull request #14428 from KorPhaeron/niknakflak 
Fixes fake nuke
 2016-01-08 07:18:03 -06:00
duncathan salt 227b3149b2 Merge pull request #14441 from SouDescolado/master 
Fixes abandoned crates minigame / Also fixes tuberculosis kit
 2016-01-08 07:16:22 -06:00
duncathan salt 7c1578a21d Merge pull request #14447 from AnturK/imbleending 
Fixes NOBLOOD species bleeding
 2016-01-08 07:15:32 -06:00
duncathan salt 6fcb78044d Merge pull request #14450 from AnturK/mechboots 
Fixes mechs using occupant spacemove
 2016-01-08 07:14:46 -06:00
duncathan salt c594d2dfa6 Merge pull request #14462 from MMMiracles/ezpoints 
Misc Fixes
 2016-01-08 07:13:00 -06:00
duncathan salt 3da7b46732 Merge pull request #14466 from MightyRadcon/master 
Fixes simple bots broadcasting department radios
 2016-01-08 07:11:02 -06:00
duncathan salt a1d0b96396 Merge pull request #14475 from bgobandit/fixtres 
Slung improvised shotgun now properly updates its sprite.
 2016-01-08 07:09:58 -06:00
Tkdrg 5589ac7559 Revert "Merge pull request #12935 from AndrewJacksonThe2nd/objectives_rework" 
This reverts commit 52a45b6292, reversing
changes made to 19b43ba668.

Conflicts:
	code/datums/mind.dm
 2016-01-07 23:15:35 -03:00
tkdrg bc8e46b8a3 Merge pull request #14440 from MrStonedOne/patch-119 
Fixes map loader not initializing map edited path/type vars
 2016-01-07 20:28:56 -03:00
tkdrg 2b3da6ffc7 Merge pull request #14455 from KorPhaeron/revive 
Revive now removes hallucination
 2016-01-07 20:03:33 -03:00
tkdrg a065241a69 Merge pull request #14444 from xxalpha/fixrecursiveab 
Fix recursive action buttons
 2016-01-07 19:54:33 -03:00
KorPhaeron a960dcf5e6 Clip descriptions 2016-01-07 16:08:02 -06:00
KorPhaeron 407960a358 Copypasted wrong 2016-01-07 14:46:12 -06:00
KorPhaeron 7d332e869c Fixes monkeys 2016-01-07 14:41:55 -06:00
KorPhaeron 224c5d1029 Use defines 2016-01-07 13:10:12 -06:00
KorPhaeron c93fcdb5dc Wall layer 2016-01-07 13:02:36 -06:00
Razharas d80a487ac0 Merge pull request #14438 from KorPhaeron/spacevine 
Fixes being able to attack vine controllers
 2016-01-07 18:26:50 +03:00
AnturK 6fbb930d2b Removes the annoying autorefresh in mulebots. 2016-01-07 15:04:12 +01:00
AnturK 51086a14b4 Fixes revive breaking bot icon 2016-01-07 14:55:12 +01:00
bgobandit 8aa51b79ec Slung improvised shotgun now properly updates its sprite. 2016-01-07 07:55:59 -05:00
tkdrg 8cbb8f7195 Merge pull request #14427 from ChangelingRain/clampedlife 
Clamp()s in living damage procs
 2016-01-07 02:11:01 -03:00
duncathan salt 18b9d67ab5 Merge pull request #14364 from swankcookie/cockroach_guts_fix 
Cockroach guts fix
 2016-01-06 22:50:15 -06:00
MightyRadcon c89007f1f7 Fixes simple bots broadcasting department radios 
Started with #13471 but all simple bots (medbots, floorbots, etc.) had this problem.
 2016-01-06 20:27:09 -08:00
swankcookie d4c3048a31 Removes redundant anchor tags 
Signed-off-by: swankcookie <__X__>
 2016-01-06 22:08:17 -06:00
tkdrg 500bc7b89d Merge pull request #14426 from ChangelingRain/droneseeker 
Drone messages now have a follow link for ghosts.
 2016-01-07 00:46:32 -03:00
MMMiracles f8d53ef78e changes abductor guide to current procedure, removes extra message from containment field shocking 2016-01-06 20:40:26 -05:00
tkdrg 475918b22d Merge pull request #14421 from KorPhaeron/beepsky 
[s]Fixes Beepsky exploit
 2016-01-06 18:55:04 -03:00
tkdrg 3412e83c17 Merge pull request #14420 from KorPhaeron/gate 
Fixes driving ATVs through gateways
 2016-01-06 18:51:17 -03:00
KorPhaeron fcaa571527 Revive 2016-01-06 15:38:01 -06:00
AnturK 8b1b75258b Offloads finding backup to atom/movable proc 2016-01-06 20:47:50 +01:00
Cheridan d16fe1c490 Merge pull request #14419 from KorPhaeron/chasm_fix 
Chasm Fix
 2016-01-06 13:30:17 -06:00
Dorsisdwarf e90750fc54 muh brakkets 2016-01-06 19:04:14 +00:00
AnturK cec4df95ff Fixes NOBLOOD species bleeding 2016-01-06 19:49:03 +01:00
KorPhaeron d76f6ad564 Hippie 2016-01-06 12:46:21 -06:00
Cheridan 1e516a68c7 Merge pull request #14347 from Iamgoofball/patch-143 
Tesla Nerf (shh dont tell aran)
 2016-01-06 12:22:05 -06:00
Dorsisdwarf ae789ed651 Generalises the check 2016-01-06 18:02:05 +00:00
xxalpha 7caab87021 Fix recursive action buttons 2016-01-06 17:27:31 +00:00
tkdrg 45e813ffd2 Merge pull request #14414 from phil235/GuardianDerpFix 
Fixes path typo
 2016-01-06 14:18:52 -03:00
Nerd Lord dcb8f18ea9 flip it upside down and typecast it 2016-01-06 10:26:20 -05:00
Nerd Lord aec8099e15 Simplify, get more speed. 2016-01-06 10:18:58 -05:00
SouDescolado 4a7cb6a066 Fixes abandoned crates minigame 
Replaces the user input 0 with "z"(Code side only. Player can still use
0). Wont return 0 as "cows" anymore.

Remove useless variable
 2016-01-06 10:43:54 -02:00
Kyle Spier-Swenson 196c98e056 Fixes map loader not initializing map edited path/type vars 2016-01-06 03:54:03 -08:00
KorPhaeron f2f868e7c7 Vine controller 2016-01-06 02:32:25 -06:00
KorPhaeron cc69b62c5c Fixes fake nuke 2016-01-05 22:51:04 -06:00
duncathan salt bee40cf9cd Merge pull request #14388 from ChangelingRain/notsosimpleisit 
Fixes simple animal damage type handling
 2016-01-05 22:23:23 -06:00
duncathan salt 50ebfa0f17 Merge pull request #14395 from MrStonedOne/nomoreminus1 
Removes a bunch of sleep(-1) and spawn(-1) from the code
 2016-01-05 22:16:17 -06:00
Nerd Lord 2156790f8c Clamp()s instead of min(max()) in living damage procs 2016-01-05 23:16:15 -05:00
Nerd Lord bfc0e468f3 Drone messages now have a follow link for ghosts. 
GAME and SAY are not span classes that do anything.
 2016-01-05 23:03:16 -05:00