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

13853 Commits

Author SHA1 Message Date
xxalpha 4dd308c278 fix 
glass windows no strong

Affect all levels if in devastating range.
 2016-01-09 23:00:24 +00:00
KorPhaeron 082ee3b6ef Soulstone 2016-01-09 16:08:18 -06:00
tkdrg 24b7eaa23a Merge pull request #14488 from KorPhaeron/wall_layer 
Walls are a slightly higher layer than floors
 2016-01-09 18:41:59 -03:00
tkdrg 990efcbb7a Merge pull request #14526 from KorPhaeron/virus 
Fixes virus grenade kit being empty
 2016-01-09 18:40:58 -03:00
KorPhaeron 1d9b334e50 Fixes layers 2016-01-09 15:32:35 -06:00
tkdrg fd08e1b103 Merge pull request #14521 from KorPhaeron/sleeper 
Fixes sleepers deleting people when destroyed
 2016-01-09 17:00:38 -03:00
KorPhaeron a3565f2a38 New code standards 2016-01-09 13:42:02 -06:00
Tkdrg b6d0cee2f7 Merge branch 'KorPhaeron-lava_rivers' into HEAD 
Closes #13511
 2016-01-09 12:07:34 -03:00
KorPhaeron b96bec5157 River Generation Module 
This is going to be used for lava rivers in lavaland.
 2016-01-09 12:06:55 -03:00
Aranclanos 95df33b325 Merge pull request #14313 from tkdrg/goooof 
Revert "Merge pull request #12935 from AndrewJacksonThe2nd/objectives_rework"
 2016-01-08 20:39:16 -03:00
KorPhaeron a35cdae739 Fixes grenade kit as well 2016-01-08 16:03:17 -06:00
KorPhaeron b6474aa48f virus 2016-01-08 15:58:35 -06:00
tkdrg 50bb3263bb Merge pull request #14485 from lordpidey/Mop_bucket 
Can put mop in janicart when dry
 2016-01-08 18:14:47 -03:00
tkdrg 6c41d0e437 Merge pull request #14468 from KorPhaeron/fuck_off_already 
Stops defibs/cloners notifying suicides when people are trying to revive them
 2016-01-08 18:09:29 -03:00
KorPhaeron 5f425326a1 Fixes sleepers 2016-01-08 13:16:50 -06:00
tkdrg 920bbeb2c4 Merge pull request #14480 from AnturK/minor 
Minor Fixes
 2016-01-08 15:13:22 -03:00
duncathan salt 3e63559769 Merge pull request #14423 from AnturK/soulstonefix 
Fixes soulstones
 2016-01-08 07:18:32 -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 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 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
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
AnturK 1d6eac5120 Fixes spawned buttons 2016-01-07 14:52:30 +01: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 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
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
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
AnturK 8b1b75258b Offloads finding backup to atom/movable proc 2016-01-06 20:47:50 +01:00
tkdrg 5d6b18b177 Merge pull request #14446 from KorPhaeron/take_their_boxes_away 
Fixes cardboard boxes deleting people
 2016-01-06 15:52:14 -03:00
KorPhaeron cf537737a1 Closets 2016-01-06 12:39:07 -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
SouDescolado 783e669c2d Fixes Tuberculosis kit 
Name was wrong
 2016-01-06 15:52:38 -02:00
tkdrg c9deb43f4e Merge pull request #14401 from Kole6738/patch-1 
Fix missing plural apostrophe
 2016-01-06 14:21:25 -03:00
tkdrg 987ec645f1 Merge pull request #14403 from Kole6738/patch-2 
Pluralize Engineer's
 2016-01-06 14:20:56 -03:00
tkdrg cf2a12120d Merge pull request #14412 from MrStonedOne/patch-118 
Revert commit f6d13b9 (blame RR) (fixes fires from crashing clients)
 2016-01-06 14:19:40 -03:00
AnturK 1a5bffc424 Fixes morph eating message showing up multiple times for the same object 2016-01-06 11:51:40 +01:00