Werner baa9c475c1 Merge branch 'upstream-master' into development-upstream ...

# Conflicts:
#	code/modules/reagents/reagent_containers/food/snacks.dm

2017-10-07 15:13:33 +02:00

..

alien

Xenomorphs fixes and improvements (#3548)

2017-10-07 13:10:18 +03:00

crates_lockers

Port Integrated Electronics from Polaris (#3371)

2017-09-12 21:41:39 -05:00

stool_bed_chair_nest

Fixes to getFlatIcon and more. (#3353)

2017-09-19 15:43:01 +03:00

banner.dm

Converts some istype's to use helpers (#3224)

2017-08-06 22:08:42 +03:00

barsign.dm

…

bedsheet_bin.dm

…

coathanger.dm

Updates the coat hanger (#2950)

2017-07-06 23:36:15 +03:00

curtains.dm

Adds more sounds effects (#3474)

2017-09-20 13:23:47 -06:00

displaycase.dm

…

door_assembly.dm

Smooth doors + multi-tile door code tweaks (#3365)

2017-09-03 16:24:25 +03:00

electricchair.dm

Converts some istype's to use helpers (#3224)

2017-08-06 22:08:42 +03:00

extinguisher.dm

Adds more sounds (#3327)

2017-08-27 16:58:34 -05:00

fireaxe_cabinet.dm

Converts some istype's to use helpers (#3224)

2017-08-06 22:08:42 +03:00

flora.dm

…

girders.dm

Converts some istype's to use helpers (#3224)

2017-08-06 22:08:42 +03:00

grille.dm

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

inflatable.dm

ZAS Performance Improvements (#2308)

2017-05-20 19:00:15 +03:00

janicart.dm

Converts some istype's to use helpers (#3224)

2017-08-06 22:08:42 +03:00

kitchen_spike.dm

…

lamarr_cage.dm

Lamar is back in a cage (#2785)

2017-06-26 19:26:24 +03:00

lattice.dm

Converts some istype's to use helpers (#3224)

2017-08-06 22:08:42 +03:00

mirror.dm

Cult and antag fixes/tweaks (#3524)

2017-10-02 22:34:01 -05:00

mop_bucket.dm

…

morgue.dm

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

musician.dm

Merge branch 'upstream-master' into development-upstream

2017-10-07 15:13:33 +02:00

noticeboard.dm

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

plasticflaps.dm

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

safe.dm

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

shotgun_rack.dm

Adds shotgun rack and more map fixes (#2841)

2017-06-27 11:20:35 +03:00

signs.dm

Converts some istype's to use helpers (#3224)

2017-08-06 22:08:42 +03:00

simple_doors.dm

Kill processing_objects (#3398)

2017-09-09 15:22:58 -05:00

tank_dispenser.dm

Converts some istype's to use helpers (#3224)

2017-08-06 22:08:42 +03:00

target_stake.dm

…

tranqcabinet.dm

…

transit_tubes.dm

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

under_wardrobe.dm

…

watercloset.dm

More stats (#3562)

2017-10-06 19:39:15 +02:00

windoor_assembly.dm

Converts some istype's to use helpers (#3224)

2017-08-06 22:08:42 +03:00

window_spawner.dm

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

window.dm

Converts some istype's to use helpers (#3224)

2017-08-06 22:08:42 +03:00