deathride58 742d50b5e7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization ...

# Conflicts:
#	code/citadel/custom_loadout/custom_items.dm
#	code/datums/components/riding.dm
#	code/game/objects/items/implants/implantuplink.dm
#	icons/mob/neck.dmi
#	icons/obj/clothing/cloaks.dmi

2017-12-08 19:58:41 -05:00

..

beds_chairs

[READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on

2017-12-03 15:33:29 -06:00

crates_lockers

Update medical.dm

2017-12-08 12:23:03 -05:00

transit_tubes

Minor speedups to movement: First Blood Part 2

2017-11-14 15:00:45 -06:00

ai_core.dm

JSON feedback

2017-11-17 01:44:12 -06:00

aliens.dm

…

artstuff.dm

…

barsigns.dm

[MIRROR] Grammar fixes to atom descriptions (#3165)

2017-10-21 07:17:03 -05:00

bedsheet_bin.dm

merges #3877 proper

2017-11-22 17:37:22 -05:00

destructible_structures.dm

…

displaycase.dm

[MIRROR] Grammar fixes to atom descriptions (#3165)

2017-10-21 07:17:03 -05:00

divine.dm

…

door_assembly.dm

[MIRROR] Grammar fixes to atom descriptions (#3165)

2017-10-21 07:17:03 -05:00

dresser.dm

…

electricchair.dm

…

extinguisher.dm

Remove drop_item, drop_item_v, put_in_hands_or_del

2017-10-07 12:37:06 -05:00

false_walls.dm

Adds a timer to falsewall code (#32637)

2017-11-13 03:29:21 -06:00

fireaxe.dm

Remove drop_item, drop_item_v, put_in_hands_or_del

2017-10-07 12:37:06 -05:00

fireplace.dm

…

flora.dm

merges #3877 proper

2017-11-22 17:37:22 -05:00

fluff.dm

Moves some machine sprites into /machines/ folder

2017-12-05 03:24:03 -06:00

ghost_role_spawners.dm

Moves some machine sprites into /machines/ folder

2017-12-05 03:24:03 -06:00

girders.dm

Updates some item drops to use drop_location()

2017-11-24 12:59:33 -06:00

grille.dm

Prevents grilles from magically regenerating (#33357)

2017-12-08 12:24:12 -06:00

guncase.dm

512 forward compatibility merge

2017-10-29 10:28:36 -05:00

hivebot.dm

Update hivebot.dm

2017-10-13 22:32:10 -05:00

holosign.dm

[MIRROR] Grammar fixes to atom descriptions (#3165)

2017-10-21 07:17:03 -05:00

janicart.dm

512 forward compatibility merge

2017-10-29 10:28:36 -05:00

kitchen_spike.dm

[MIRROR] Grammar fixes to atom descriptions (#3165)

2017-10-21 07:17:03 -05:00

ladders.dm

Refactor ladders so that they actually work (#32797)

2017-11-20 02:05:52 -06:00

lattice.dm

Merge pull request #31275 from kingofkosmos/moredeconhints

2017-10-04 16:33:51 -05:00

life_candle.dm

…

manned_turret.dm

Merge pull request #33324 from deathride58/foreignfurryaddswidescreen

2017-12-08 10:35:23 -06:00

memorial.dm

…

mineral_doors.dm

Radiation rework and subsystem

2017-10-13 09:22:23 -05:00

mirror.dm

Allows species to be blocked from ever being roundstart, can now choose your Halloween species

2017-10-20 10:11:35 -05:00

mop_bucket.dm

…

morgue.dm

Minor speedups to movement: First Blood Part 2

2017-11-14 15:00:45 -06:00

musician.dm

Fixes big band music crate (#33138)

2017-11-28 19:02:54 -06:00

noticeboard.dm

512 forward compatibility merge

2017-10-29 10:28:36 -05:00

petrified_statue.dm

…

plasticflaps.dm

Minor speedups to movement: First Blood Part 2

2017-11-14 15:00:45 -06:00

reflector.dm

Reflector fixes and improvements

2017-10-31 21:01:45 -05:00

safe.dm

512 forward compatibility merge

2017-10-29 10:28:36 -05:00

showcase.dm

Moves some machine sprites into /machines/ folder

2017-12-05 03:24:03 -06:00

signs.dm

[MIRROR] Grammar fixes to atom descriptions (#3165)

2017-10-21 07:17:03 -05:00

spirit_board.dm

…

statues.dm

Plasma statues get fixed (#33224)

2017-12-03 13:16:45 -06:00

table_frames.dm

…

tables_racks.dm

Lowers rack layer to 2.8 (#33069)

2017-11-25 09:21:02 -06:00

tank_dispenser.dm

Remove drop_item, drop_item_v, put_in_hands_or_del

2017-10-07 12:37:06 -05:00

target_stake.dm

Update target_stake.dm

2017-10-07 22:50:50 -05:00

traps.dm

[MIRROR] Grammar fixes to atom descriptions (#3165)

2017-10-21 07:17:03 -05:00

watercloset.dm

Merge pull request #32215 from kevinz000/patch-363

2017-10-30 14:37:37 -05:00

windoor_assembly.dm

Minor speedups to movement: First Blood Part 2

2017-11-14 15:00:45 -06:00

window.dm

Minor speedups to movement: First Blood Part 2

2017-11-14 15:00:45 -06:00