shazbot194 234c8a78bc Merge conflict fix

2018-04-04 12:18:07 -08:00

..

crates_lockers

Merge conflict fix

2018-04-04 12:18:07 -08:00

decor

…

stool_bed_chair_nest

Merge pull request #8124 from Aurorablade/Dreams

2018-03-19 13:42:00 -07:00

transit_tubes

…

artstuff.dm

…

barsign.dm

moves var/list/armor to /obj level

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

bedsheet_bin.dm

Sleeping can heal

2017-11-02 02:36:58 -04:00

coathanger.dm

…

curtains.dm

moves var/can_deconstruct to obj level

2017-12-26 18:16:42 +05:00

displaycase.dm

moves var/list/armor to /obj level

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

door_assembly_types.dm

moves material defines to construction.dm

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

door_assembly.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

dresser.dm

…

electricchair.dm

compiles, find and replace particle_effect and effect_system

2017-11-04 20:16:01 +04:00

engicart.dm

…

extinguisher.dm

…

false_walls.dm

moves material defines to construction.dm

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

flora.dm

…

foodcart.dm

…

fullwindow.dm

moves var/list/armor to /obj level

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

girders.dm

rename __DEFINES/mob.dm to __DEFINES/mobs.dm

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

grille.dm

addresses minor issues:

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

inflatable.dm

rename __DEFINES/mob.dm to __DEFINES/mobs.dm

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

janicart.dm

…

kitchen_spike.dm

…

ladders.dm

…

lamarr_cage.dm

…

lattice.dm

moves var/list/armor to /obj level

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

mineral_doors.dm

moves var/list/armor to /obj level

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

mirror.dm

visible message and styling tweaks

2017-09-12 23:06:01 -04:00

misc.dm

repaths /obj/effect/overlay/temp to /obj/effect/temp_visual

2018-01-18 13:03:49 +05:00

mop_bucket.dm

…

morgue.dm

removes useless alter_health() unused proc

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

musician.dm

Ports Nano UI to Subsystems

2018-03-26 23:59:52 -04:00

noticeboard.dm

…

plasticflaps.dm

moves var/list/armor to /obj level

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

safe.dm

…

signs.dm

moves var/list/armor to /obj level

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

spirit_board.dm

…

statues.dm

gets rid of an unneeded (

2017-11-25 12:17:36 -05:00

table_frames.dm

rename __DEFINES/mob.dm to __DEFINES/mobs.dm

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

tables_racks.dm

rename __DEFINES/mob.dm to __DEFINES/mobs.dm

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

tank_dispenser.dm

Ports Nano UI to Subsystems

2018-03-26 23:59:52 -04:00

target_stake.dm

…

watercloset.dm

Arcade map

2017-09-19 00:20:49 -04:00

windoor_assembly.dm

Add "One access" to non secure windoor #5973

2018-03-22 20:25:37 -07:00

window.dm

rename __DEFINES/mob.dm to __DEFINES/mobs.dm

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