Shadowlight213 ce01058e7c Fixes merge conflicts

2016-05-27 15:36:56 -07:00

..

beds_chairs

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

crates_lockers

Fix an antipattern when using canUseTopic

2016-05-22 00:23:47 +00:00

transit_tubes

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

ai_core.dm

Conflicts III

2016-05-15 00:59:44 -04:00

aliens.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

artstuff.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

barsigns.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

bedsheet_bin.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

displaycase.dm

the fact this never came up is surprising

2016-05-01 12:20:06 -04:00

door_assembly.dm

Doors can now be attacked when clicked on harm intent. (they're currently indestructible so it's only cosmetic for now). I tried to make door code more OOP.

2016-04-24 20:39:30 +02:00

dresser.dm

…

electricchair.dm

…

extinguisher.dm

Wall-mounted extinguisher cabinets are now constructable/deconstructable

2016-04-29 15:31:23 +03:00

false_walls.dm

Fixes falsewalls being unsmashable (#17135)

2016-04-27 17:29:56 +02:00

fireaxe.dm

Blobs can no longer eat the supermatter (#17205)

2016-04-29 20:29:20 +02:00

flora.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

girders.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

grille.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

guncase.dm

Same things but with structures now.

2016-04-24 20:38:33 +02:00

hivebot.dm

…

janicart.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

kitchen_spike.dm

Merges Pull and Grab into a single functionality. Pulling someone is now the same as a passive grab. You can start pulling someone with ctrlclick or by using the grab intent with empty hand. Using the grab intent again on the pulled person tries to grab them aggressively, then neck grab, then kill grab.

2016-05-24 01:28:04 +02:00

ladders.dm

Shuttle manipulator (#17436)

2016-05-26 15:15:19 +02:00

lattice.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

mineral_doors.dm

Same things but with structures now.

2016-04-24 20:38:33 +02:00

mirror.dm

Speed in nograv works correctly now

2016-05-08 16:39:54 -07:00

mop_bucket.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

morgue.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

musician.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

noticeboard.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

plasticflaps.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

reflector.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

safe.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

showcase.dm

Alternate escape shuttles and ferries (#16761)

2016-05-07 23:35:57 +02:00

signs.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

spirit_board.dm

…

statues.dm

Removing some comments I had left in.

2016-04-24 21:12:04 +02:00

table_frames.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

tables_racks.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

tank_dispenser.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

target_stake.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

watercloset.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

windoor_assembly.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

window.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00