tigercat2000 b14faa19c3 Merge remote-tracking branch 'upstream/master' into SMC ...

# Conflicts:
#	code/__DEFINES/flags.dm

2018-03-22 15:35:12 -07:00

..

atmoalter

Merge remote-tracking branch 'upstream/master' into SMC

2018-03-22 15:35:12 -07:00

camera

moves var/list/armor to /obj level

2018-03-04 13:52:54 +05:00

computer

Merge pull request #8674 from uraniummeltdown/attacks

2018-03-22 11:55:53 -07:00

doors

Merge pull request #8674 from uraniummeltdown/attacks

2018-03-22 11:55:53 -07:00

embedded_controller

…

pipe

…

telecomms

…

adv_med.dm

…

ai_slipper.dm

moves var/list/armor to /obj level

2018-03-04 13:52:54 +05:00

alarm.dm

moves var/list/armor to /obj level

2018-03-04 13:52:54 +05:00

atmo_control.dm

PS -> SMC Ports: LINDA, Spacedrift, Throwing

2018-03-02 23:58:57 -08:00

autolathe.dm

…

Beacon.dm

…

buttons.dm

…

cell_charger.dm

…

chiller.dm

…

cloning.dm

…

constructable_frame.dm

…

cryo.dm

moves var/list/armor to /obj level

2018-03-04 13:52:54 +05:00

cryopod.dm

also fix a semi-related runtime

2017-12-31 19:37:13 -08:00

dance_machine.dm

why github

2018-02-20 00:56:52 -05:00

deployable.dm

…

door_control.dm

…

doppler_array.dm

…

dye_generator.dm

don't stand so close to me..

2017-12-11 23:33:22 -05:00

firealarm.dm

moves var/list/armor to /obj level

2018-03-04 13:52:54 +05:00

flasher.dm

…

floodlight.dm

…

Freezer.dm

moves var/list/armor to /obj level

2018-03-04 13:52:54 +05:00

gameboard.dm

…

guestpass.dm

…

hologram.dm

moves var/list/armor to /obj level

2018-03-04 13:52:54 +05:00

holosign.dm

…

igniter.dm

moves var/list/armor to /obj level

2018-03-04 13:52:54 +05:00

iv_drip.dm

…

lightswitch.dm

…

machinery.dm

makes door code more OOP: reduced copypasta in shutter and poddoor code, they have their own icon files, changed name of icon_states in the maps

2018-03-04 13:52:55 +05:00

magnet.dm

…

mass_driver.dm

…

navbeacon.dm

moves var/list/armor to /obj level

2018-03-04 13:52:54 +05:00

newscaster.dm

moves var/list/armor to /obj level

2018-03-04 13:52:54 +05:00

OpTable.dm

…

overview.dm

…

PDApainter.dm

…

poolcontroller.dm

The ocean is no longer colder than space; some code cleanup and added defines

2018-01-12 01:43:54 +00:00

portable_tag_turret.dm

…

portable_turret.dm

moves var/list/armor to /obj level

2018-03-04 13:52:54 +05:00

programmable_unloader.dm

…

quantum_pad.dm

…

recharger.dm

…

rechargestation.dm

…

recycler.dm

moves material defines to construction.dm

2018-02-06 01:24:36 +05:00

requests_console.dm

moves var/list/armor to /obj level

2018-03-04 13:52:54 +05:00

robot_fabricator.dm

…

shieldgen.dm

…

Sleeper.dm

removes useless alter_health() unused proc

2018-01-02 20:49:28 +05:00

slotmachine.dm

…

spaceheater.dm

moves var/list/armor to /obj level

2018-03-04 13:52:54 +05:00

status_display.dm

…

suit_storage_unit.dm

…

supply_display.dm

…

syndicatebeacon.dm

…

syndicatebomb.dm

…

teleporter.dm

…

transformer.dm

Fixes xray machines

2018-03-19 14:15:34 +01:00

turntable.dm

…

turret_control.dm

…

vending.dm

moves var/list/armor to /obj level

2018-03-04 13:52:54 +05:00

washing_machine.dm

…

wishgranter.dm

…