unknown 4b396a52e7 Resolved conflicts

2016-06-19 15:07:36 -04:00

..

devices

Resolved conflicts

2016-06-17 18:56:51 -04:00

robot

Added priority overlay system. (#18225)

2016-06-17 10:11:53 +12:00

stacks

Fulton Revival (#18480)

2016-06-17 13:35:47 +12:00

weapons

Adds cogscarabs to clock cult (#18685)

2016-06-19 17:26:35 +02:00

apc_frame.dm

…

blueprints.dm

Cyborg Blueprints

2016-04-30 03:47:51 -05:00

body_egg.dm

Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior.

2016-05-05 18:17:51 +02:00

bodybag.dm

Added priority overlay system. (#18225)

2016-06-17 10:11:53 +12:00

candle.dm

Fixes spawning lit candles printing messages

2016-05-10 19:13:11 +01:00

charter.dm

Safer input for the station charter (#18556)

2016-06-16 23:51:10 +01:00

control_wand.dm

properly

2016-06-13 09:43:01 -04:00

crayons.dm

Added priority overlay system. (#18225)

2016-06-17 10:11:53 +12:00

dehy_carp.dm

Using a dehydrated carp no longer strips the neutral faction from the owner.

2016-06-14 22:01:00 -04:00

documents.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

latexballoon.dm

…

nuke_tools.dm

clean

2016-05-21 16:42:37 +01:00

shooting_range.dm

Added priority overlay system. (#18225)

2016-06-17 10:11:53 +12:00

toys.dm

All living mobs can now attempt to pick up cards

2016-06-17 09:48:20 +01:00

trash.dm

…