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
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 2e7a852f3a Merge pull request #14464 from bgobandit/fixdos 
Non-airlock doors check for mobs while closing + extra shit
 2016-01-08 07:12:24 -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
duncathan salt 9c820d4824 Merge pull request #14386 from AnturK/clonesabotage 
Fixes modified clone records breaking
 2016-01-07 22:26: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
hornygranny deb5405d5b Merge pull request #14459 from KorPhaeron/fusion 
Temporary Revert Of Fusion
 2016-01-07 13:13:09 -08: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
Mike Long 33a9f7cb15 Can put mop in janicart when dry 
Fixes #5428
 2016-01-07 11:02:06 -05: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
AnturK 1d6eac5120 Fixes spawned buttons 2016-01-07 14:52:30 +01:00
bgobandit 8aa51b79ec Slung improvised shotgun now properly updates its sprite. 2016-01-07 07:55:59 -05:00
hornygranny b199af9698 Merge pull request #14472 from KorPhaeron/nerfs 
Nerfs LSG
 2016-01-06 23:52:34 -08:00
KorPhaeron ff09481e5e LSG 2016-01-07 01:48:50 -06:00
tkdrg 83b9ed8e18 Merge pull request #14433 from bgobandit/fixuno 
Windows now give a message when repaired.
 2016-01-07 03:18:48 -03:00
tkdrg 8cbb8f7195 Merge pull request #14427 from ChangelingRain/clampedlife 
Clamp()s in living damage procs
 2016-01-07 02:11:01 -03:00
tkdrg aa605a1db5 Merge pull request #14385 from AnturK/morphmessagespam 
Fixes morph eating message showing up multiple times for the same object
 2016-01-07 02:06:58 -03:00
bgobandit d2a5db5a89 really. 2016-01-06 23:53:59 -05:00
bgobandit 8b7e84e73a object oriented code 2016-01-06 23:52:19 -05:00
tkdrg ff5712db5b Merge pull request #14429 from KorPhaeron/intro_text 
Adds intro text to malf/traitor AI
 2016-01-07 01:51:27 -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
KorPhaeron 1ce90959ef Notify 2016-01-06 22:40:50 -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 98d4b9076d Moves contraband to a more fitting location 
Signed-off-by: swankcookie <__X__>
 2016-01-06 22:12:00 -06: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
bgobandit 5f74ba1f84 Non-airlock doors check for mobs while closing. Removes awful istypes. 2016-01-06 21:18:52 -05:00
MMMiracles 3edf4a5e4c noting can fex bade speeling 2016-01-06 20:57:31 -05:00
MMMiracles f8d53ef78e changes abductor guide to current procedure, removes extra message from containment field shocking 2016-01-06 20:40:26 -05:00
KorPhaeron 87b889ca76 Fusion 2016-01-06 18:36:49 -06: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
Kyle Spier-Swenson 17c2c37891 Fixes cult teleport centcom exploit. 
This was an edge case anyhow, they would have to do it while the shuttle was in transit to centcom as it would delete everything once it go to centcom.
 2016-01-06 11:41:07 -08: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