shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
c7db4e8310015f199646ae1d0843ebe87828ee77
GS13NG/code/game/machinery
History
LetterJay 518b264654 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783 
# Conflicts:
#	_maps/map_files/generic/CentCom.dmm
#	code/modules/mob/living/living.dm
2017-12-29 01:34:17 -06:00
..
camera
Moves some machine sprites into /machines/ folder
2017-12-05 03:24:03 -06:00
computer
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783
2017-12-29 01:34:17 -06:00
doors
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783
2017-12-29 01:34:17 -06:00
embedded_controller
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
pipe
Defines math, take 2
2017-12-17 10:02:43 -06:00
porta_turret
Simple wall turret buff (#32937)
2017-11-22 12:44:59 -06:00
telecomms
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -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
DisplayTimeText mk2
2017-09-24 18:59:57 -05:00
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
Alt-clicking descriptions when examining
2017-09-28 21:51:53 -05:00
autolathe.dm
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
2017-12-11 16:36:38 -08:00
bank_machine.dm
512 forward compatibility merge
2017-10-29 10:28:36 -05: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
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
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
Merge pull request #3267 from Citadel-Station-13/upstream-merge-31399
2017-10-10 05:54:08 -04:00
firealarm.dm
Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-13 13:56:57 -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
[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
here we go again (#2456)
2017-08-24 19:24:25 -07:00
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
Update lightswitch.dm
2017-10-22 10:55:52 -05:00
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
ismecha define
2017-10-02 01:04:53 -05:00
navbeacon.dm
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
newscaster.dm
Merge branch 'master' into upstream-merge-33504
2017-12-26 06:08:12 -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
here we go again (#2456)
2017-08-24 19:24:25 -07:00
recycler.dm
Fix many instances of "the the"
2017-10-13 09:41:54 -05:00
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
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
suit_storage_unit.dm
Moves some machine sprites into /machines/ folder
2017-12-05 03:24:03 -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
Merge pull request #32864 from ike709/dir
2017-11-19 22:42:28 -06:00
transformer.dm
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
vending.dm
Revert "Vending TGUI"
2017-12-26 09:10:48 -06:00
washing_machine.dm
here we go again (#2456)
2017-08-24 19:24:25 -07:00
wishgranter.dm
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00