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

..

camera

Moves some machine sprites into /machines/ folder

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

computer

Merge pull request #32964 from AutomaticFrenzy/patch/joules

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

doors

Fix some unquoted list associations (#33290)

2017-12-05 15:31:05 -06:00

embedded_controller

Update simple_vent_controller.dm

2017-11-11 15:55:34 -06:00

pipe

RPD ui improvements

2017-11-17 18:03:56 -06:00

porta_turret

Simple wall turret buff (#32937)

2017-11-22 12:44:59 -06:00

telecomms

JSON feedback

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

_machinery.dm

Old debug objects which one has been replaced and another nobody needs at the moment. Also removal of comments that I forgot to removal at _machinery.dm (#32685)

2017-11-14 05:01:25 -06:00

ai_slipper.dm

…

airlock_control.dm

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

announcement_system.dm

512 forward compatibility merge

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

aug_manipulator.dm

…

autolathe.dm

Removes ComponentActivated in favor of callbacks

2017-12-05 15:42:47 -06:00

bank_machine.dm

512 forward compatibility merge

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

Beacon.dm

Cleanup to various loc assignments and nearby code

2017-09-30 08:10:52 -05:00

buttons.dm

Cleanup to various loc assignments and nearby code

2017-09-30 08:10:52 -05:00

cell_charger.dm

Fixes cell charger animation (#32748)

2017-11-15 19:08:10 -06:00

cloning.dm

Moves some machine sprites into /machines/ folder

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

constructable_frame.dm

Update constructable_frame.dm

2017-10-07 22:49:19 -05:00

dance_machine.dm

512 forward compatibility merge

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

deployable.dm

…

dna_scanner.dm

Moves some machine sprites into /machines/ folder

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

doppler_array.dm

Update doppler_array.dm

2017-11-20 00:05:43 -05:00

droneDispenser.dm

Merge pull request #3267 from Citadel-Station-13/upstream-merge-31399

2017-10-10 05:54:08 -04:00

firealarm.dm

Cleans up unused code

2017-11-20 10:14:32 -06:00

flasher.dm

Remove drop_item, drop_item_v, put_in_hands_or_del

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

gulag_item_reclaimer.dm

512 forward compatibility merge

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

gulag_teleporter.dm

…

hologram.dm

Holorecord disks.

2017-12-04 05:14:13 -06:00

igniter.dm

…

iv_drip.dm

Updates some item drops to use drop_location()

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

launch_pad.dm

Cleans up some qdel(src)'s in Initialize()

2017-11-26 20:15:18 -06:00

lightswitch.dm

Update lightswitch.dm

2017-10-22 10:55:52 -05:00

limbgrower.dm

512 forward compatibility merge

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

magnet.dm

512 forward compatibility merge

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

mass_driver.dm

ismecha define

2017-10-02 01:04:53 -05:00

navbeacon.dm

Update navbeacon.dm

2017-11-11 23:09:07 -06:00

newscaster.dm

JSON feedback

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

overview.dm

Cleans up unused code

2017-11-20 10:14:32 -06:00

PDApainter.dm

Fix many instances of "the the"

2017-10-13 09:41:54 -05:00

quantum_pad.dm

Fix many instances of "the the"

2017-10-13 09:41:54 -05:00

recharger.dm

Integrated circuit fixes and code improvements

2017-11-21 03:04:17 -06:00

rechargestation.dm

…

recycler.dm

Fix many instances of "the the"

2017-10-13 09:41:54 -05:00

requests_console.dm

512 forward compatibility merge

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

robot_fabricator.dm

512 forward compatibility merge

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

shieldgen.dm

Minor speedups to movement: First Blood Part 2

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

Sleeper.dm

Moves some machine sprites into /machines/ folder

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

slotmachine.dm

512 forward compatibility merge

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

spaceheater.dm

Remove drop_item, drop_item_v, put_in_hands_or_del

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

status_display.dm

Improve extended examination text for many objects (#31381)

2017-10-10 03:07:38 -05:00

suit_storage_unit.dm

Moves some machine sprites into /machines/ folder

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

syndicatebeacon.dm

Update syndicatebeacon.dm

2017-11-14 16:07:26 -06:00

syndicatebomb.dm

Merge branch 'master' into upstream-merge-31176

2017-11-09 03:24:38 -06:00

teleporter.dm

Merge pull request #32864 from ike709/dir

2017-11-19 22:42:28 -06:00

transformer.dm

…

vending.dm

Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization

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

washing_machine.dm

…

wishgranter.dm

…