Xhuis 2b18993b04 Conflicts II

2016-06-03 15:42:19 -04:00

..

beds_chairs

Merge pull request #17936 from MMMiracles/ruin_stuff

2016-05-31 15:58:12 +12:00

crates_lockers

repaths plant analyzers

2016-06-01 22:44:03 -07:00

transit_tubes

Layers are now defines (#17949)

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

ai_core.dm

Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

2016-05-30 18:33:55 +03:00

aliens.dm

Layers are now defines (#17949)

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

artstuff.dm

…

barsigns.dm

…

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

…

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

fix!

2016-06-01 20:17:48 -04: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

…

hivebot.dm

…

janicart.dm

…

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

…

mirror.dm

Speed in nograv works correctly now

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

mop_bucket.dm

…

morgue.dm

Layers are now defines (#17949)

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

musician.dm

…

noticeboard.dm

…

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

…

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

…

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

…

window.dm

More stuff, no conflict fix yet

2016-06-03 15:07:49 -04:00