Kyep 4d4eb16a3a fixes merge conflict

2018-06-06 16:32:31 -07:00

..

crates_lockers

fixes merge conflict

2018-06-06 16:32:31 -07:00

decor

…

stool_bed_chair_nest

Removes All Weapons

2018-04-15 16:25:56 -04:00

transit_tubes

Removes All Weapons

2018-04-15 16:25:56 -04:00

aliens.dm

alien object damage system

2018-05-19 03:26:10 -04:00

artstuff.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

barsign.dm

Ports over Timer Subsystem

2018-04-28 20:26:04 -04:00

bedsheet_bin.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

coathanger.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

curtains.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

depot.dm

fixes sentry bot issues, also mechs, mirrors, medibot and pod

2018-01-06 05:36:32 -08:00

displaycase.dm

Replace \his, \he, \him, \himself

2018-05-25 18:39:37 -07:00

door_assembly_types.dm

moves material defines to construction.dm

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

door_assembly.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

dresser.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

electricchair.dm

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

engicart.dm

Ports Holoprojectors

2018-04-30 00:24:46 -04:00

extinguisher.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

false_walls.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

flora.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

foodcart.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

girders.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

grille.dm

Merge remote-tracking branch 'upstream/master' into attack-hulk

2018-06-03 18:49:44 -04:00

guillotine.dm

More pronouns

2018-05-25 18:34:23 -07:00

holosign.dm

Ports Holoprojectors

2018-04-30 00:24:46 -04:00

inflatable.dm

SS Conversion: Atoms, Machines, n' Mobs

2018-04-28 17:55:15 -07:00

janicart.dm

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

kitchen_spike.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

ladders.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

lamarr_cage.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

lattice.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

mineral_doors.dm

SS Conversion: Atoms, Machines, n' Mobs

2018-04-28 17:55:15 -07:00

mirror.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

misc.dm

SS Conversion: Atoms, Machines, n' Mobs

2018-04-28 17:55:15 -07:00

mop_bucket.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

morgue.dm

SS Conversion: Atoms, Machines, n' Mobs

2018-04-28 17:55:15 -07:00

musician.dm

SS Conversion: Atoms, Machines, n' Mobs

2018-04-28 17:55:15 -07:00

noticeboard.dm

SS Conversion: Atoms, Machines, n' Mobs

2018-04-28 17:55:15 -07:00

plasticflaps.dm

SS Conversion: Atoms, Machines, n' Mobs

2018-04-28 17:55:15 -07:00

safe.dm

SS Conversion: Atoms, Machines, n' Mobs

2018-04-28 17:55:15 -07:00

signs.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

spirit_board.dm

Completely Overhaul Logging

2018-04-19 15:07:59 -08:00

statues.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

table_frames.dm

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

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

tables_racks.dm

Makes Hulk Attacking Less Snowflakey

2018-05-19 02:32:34 -04:00

tank_dispenser.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

target_stake.dm

…

watercloset.dm

Their

2018-05-25 18:34:24 -07:00

windoor_assembly.dm

added defines for window construction states and full window diagonal dir

2018-06-03 13:11:37 +04:00

window.dm

Merge remote-tracking branch 'upstream/master' into attack-hulk

2018-06-03 18:49:44 -04:00