kevinz000 bbcad2fa58 Proper mirror PR for the disease refactor because I fucked up the first one. (#2026) ...

* Revert "im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025)"

This reverts commit 44742cb115.

* Delete shuttle_loan.dm.rej

* Delete life.dm.rej

* Update life.dm

* Delete life.dm.rej

* compile

2017-07-31 23:41:22 -07:00

..

devices

Proper mirror PR for the disease refactor because I fucked up the first one. (#2026)

2017-07-31 23:41:22 -07:00

robot

Made some object lists less terrible to read

2017-07-18 09:44:43 -05:00

stacks

Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304

2017-07-31 03:43:03 -05:00

weapons

Proper mirror PR for the disease refactor because I fucked up the first one. (#2026)

2017-07-31 23:41:22 -07:00

apc_frame.dm

Fixes wallframes (#2001)

2017-07-14 19:35:11 -07:00

blueprints.dm

Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs (#1970)

2017-07-10 16:10:42 -07:00

body_egg.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

bodybag.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

candle.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

cardboard_cutouts.dm

July 5th TG sync (#1883)

2017-07-05 22:14:19 -05:00

control_wand.dm

Changes some 1s and 0s to TRUE and FALSE (#1967)

2017-07-10 16:13:16 -07:00

crayons.dm

Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304

2017-07-31 03:43:03 -05:00

dehy_carp.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

documents.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

eightball.dm

Eightballs are tiny items (#1013)

2017-05-18 12:37:43 -05:00

latexballoon.dm

July 5th TG sync (#1883)

2017-07-05 22:14:19 -05:00

nuke_tools.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

religion.dm

July 5th TG sync (#1883)

2017-07-05 22:14:19 -05:00

shooting_range.dm

Changes some 1s and 0s to TRUE and FALSE (#1967)

2017-07-10 16:13:16 -07:00

taster.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

theft_tools.dm

Nuke screwdrivers are no longer randomly colored (#2110)

2017-07-24 04:06:16 -07:00

toys.dm

Energy swords and other transforming energy weapons are now subtypes of transforming weapons (#2049)

2017-07-17 22:51:51 -07:00

trash.dm

…