deathride58 57d8457108 Merge pull request #4705 from Citadel-Station-13/upstream-merge-33645 ...

[MIRROR] Servants are now moved to and restricted to Reebe when the Ark starts; also updates the CC changelog

2018-01-08 04:15:47 +00:00

..

camera

Replace explicit z-level checks with defines

2017-12-29 13:41:10 -06:00

computer

Merge pull request #4705 from Citadel-Station-13/upstream-merge-33645

2018-01-08 04:15:47 +00:00

doors

Merge pull request #4530 from Citadel-Station-13/upstream-merge-33705

2017-12-30 13:19:00 -06:00

embedded_controller

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

pipe

[READY]Component Forensics and Item Blood OverlayS!

2017-12-27 15:19:14 -06:00

porta_turret

Simple wall turret buff (#32937)

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

telecomms

Revert "[MIRROR] Fix PDA message photos not being viewable"

2017-12-31 06:41:03 -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

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

announcement_system.dm

512 forward compatibility merge

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

aug_manipulator.dm

…

autolathe.dm

Removed some superfluous stack code (#34083)

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

bank_machine.dm

Removes icky ocky from the vault (#34021)

2018-01-02 13:31:28 -06:00

Beacon.dm

Replaces a bunch of loc assignments with forcemoves and moves to nullspace

2017-12-13 13:56:57 -06:00

buttons.dm

…

cell_charger.dm

Fixes cell charger animation (#32748)

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

cloning.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

constructable_frame.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

dance_machine.dm

Dance Machine now obeys instrument preference (#33607)

2017-12-17 15:02:31 -06:00

deployable.dm

Defines math, take 2

2017-12-17 10:02:43 -06:00

dna_scanner.dm

save point - a lot of shit to fix

2017-12-27 07:03:40 -06:00

doppler_array.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

droneDispenser.dm

…

firealarm.dm

Replace explicit z-level checks with defines

2017-12-29 13:41:10 -06:00

flasher.dm

…

gulag_item_reclaimer.dm

512 forward compatibility merge

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

gulag_teleporter.dm

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

hologram.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

igniter.dm

…

iv_drip.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

launch_pad.dm

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

lightswitch.dm

…

limbgrower.dm

[READY]Refactors reagent container types

2017-12-18 22:54:51 -06:00

magnet.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

mass_driver.dm

…

navbeacon.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

newscaster.dm

Update newscaster.dm

2017-12-30 13:21:31 -06:00

overview.dm

Cleans up unused code

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

PDApainter.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

quantum_pad.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

recharger.dm

Replaces a bunch of loc assignments with forcemoves and moves to nullspace

2017-12-13 13:56:57 -06:00

rechargestation.dm

…

recycler.dm

…

requests_console.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

robot_fabricator.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

shieldgen.dm

Defines math, take 2

2017-12-17 10:02:43 -06:00

Sleeper.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

slotmachine.dm

512 forward compatibility merge

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

spaceheater.dm

Merge branch 'master' into upstream-merge-33498

2017-12-19 17:50:11 -06:00

status_display.dm

Replace explicit z-level checks with defines

2017-12-29 13:41:10 -06:00

suit_storage_unit.dm

[READY]Component Forensics and Item Blood OverlayS!

2017-12-27 15:19:14 -06:00

syndicatebeacon.dm

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

syndicatebomb.dm

Defines math, take 2

2017-12-17 10:02:43 -06:00

teleporter.dm

Replace explicit z-level checks with defines

2017-12-29 13:41:10 -06:00

transformer.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

vending.dm

Merge pull request #33905 from ShizCalev/jumpsuit-fix

2017-12-29 10:10:30 -06:00

washing_machine.dm

[READY]Component Forensics and Item Blood OverlayS!

2017-12-27 15:19:14 -06:00

wishgranter.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00