phil235 029bc65b93 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing ...

# Conflicts:
#	code/game/atoms.dm
#	code/game/gamemodes/nuclear/nuclearbomb.dm

2016-10-19 01:56:02 +02:00

..

devices

Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing

2016-10-19 01:56:02 +02:00

robot

Replaces yet more istypes with helpers (#20806)

2016-10-10 17:48:35 +13:00

stacks

Suicide now uses the pronoun helpers (#20973)

2016-10-18 14:36:38 +13:00

weapons

Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing

2016-10-19 01:56:02 +02:00

apc_frame.dm

Adds a few turf istype helpers (#20754)

2016-10-01 19:25:46 +02:00

blueprints.dm

Station Blueprints now contain wire legend (#20559)

2016-09-23 10:24:57 +12:00

body_egg.dm

…

bodybag.dm

Clicking a floor with a bodybag or roller bed now deploys them directly.

2016-10-14 17:47:16 +02:00

candle.dm

Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)

2016-10-10 11:14:59 +13:00

cardboard_cutouts.dm

Adding var/list/atom_colours to /atom .

2016-10-19 01:51:30 +02:00

charter.dm

Merge pull request #18936 from MrStonedOne/patch-222

2016-06-28 00:05:40 +12:00

control_wand.dm

…

crayons.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing

2016-10-19 01:56:02 +02:00

dehy_carp.dm

Space carp ensure they still exist after animation sleep (#20710)

2016-09-28 11:01:43 -05:00

documents.dm

[Ready]Makes space wind great again! (#19494)

2016-07-28 09:43:51 +02:00

latexballoon.dm

Replaces a bunch of istypes with their proper macros (#20739)

2016-09-30 20:21:08 +02:00

nuke_tools.dm

…

religion.dm

Adding var/list/atom_colours to /atom .

2016-10-19 01:51:30 +02:00

shooting_range.dm

…

toys.dm

Suicide now uses the pronoun helpers (#20973)

2016-10-18 14:36:38 +13:00

trash.dm

Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)

2016-10-10 11:14:59 +13:00