LetterJay f2f6d9d910 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 ...

# Conflicts:
#	code/modules/events/alien_infestation.dm
#	code/modules/events/spider_infestation.dm
#	code/modules/events/vent_clog.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm

2018-01-02 05:16:13 -06:00

..

antimatter

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

singularity

Replace explicit z-level checks with defines

2017-12-29 13:41:10 -06:00

supermatter

Defines math, take 2

2017-12-17 10:02:43 -06:00

tesla

Defines math, take 2

2017-12-17 10:02:43 -06:00

apc.dm

Replace explicit z-level checks with defines

2017-12-29 13:41:10 -06:00

cable.dm

[READY]Component Forensics and Item Blood OverlayS!

2017-12-27 15:19:14 -06:00

cell.dm

Merge branch 'master' into upstream-merge-33498

2017-12-19 17:50:11 -06:00

floodlight.dm

You can smash the bulbs in floodlights (#31690)

2017-10-15 12:55:31 -05:00

generator.dm

removes silly garbage defines

2017-12-19 08:02:18 -06:00

gravitygenerator.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

lighting.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

monitor.dm

[MIRROR] Standardized power displays (#2539)

2017-09-13 17:57:16 -05:00

port_gen.dm

512 forward compatibility merge

2017-10-29 10:28:36 -05:00

power.dm

Cleans up unused code

2017-11-20 10:14:32 -06:00

powernet.dm

Defines math, take 2

2017-12-17 10:02:43 -06:00

rtg.dm

Fixes camera mobs becoming contaminated and other tweaks (#31731)

2017-10-14 17:40:34 -05:00

smes.dm

Defines math, take 2

2017-12-17 10:02:43 -06:00

solar.dm

Merge branch 'master' into upstream-merge-33498

2017-12-19 17:50:11 -06:00

switch.dm

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

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

terminal.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

tracker.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

turbine.dm

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00