cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-31 07:56:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
b5cf8383f66034e4808e416ca37e5b18a4588ca5
CHOMPstation/code/game/machinery
T
History
Leshana b5cf8383f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14 
# Conflicts:
#	code/game/machinery/jukebox.dm
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
2018-04-15 14:19:36 -04:00
..
atmoalter
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04
2018-04-06 15:40:06 -04:00
camera
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14
2018-04-15 14:19:36 -04:00
computer
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04
2018-04-06 15:40:06 -04:00
computer3
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30
2018-03-31 09:20:59 -04:00
doors
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14
2018-04-15 14:19:36 -04:00
embedded_controller
…
kitchen
Arranges lots of things into planes (#5072)
2018-03-28 12:59:12 -07:00
pipe
POLARIS: Fix pipelayer and restore pipe pulling
2018-03-20 23:30:21 -04:00
telecomms
…
adv_med_vr.dm
VS: Rewrites basically all of how bellies work
2018-02-27 13:29:45 -05:00
adv_med.dm
POLARIS: Fix incorrect robolimb checks
2018-03-25 17:14:46 -04:00
ai_slipper.dm
Arranges lots of things into planes (#5072)
2018-03-28 12:59:12 -07:00
airconditioner_vr.dm
…
alarm.dm
Port SSoverlays & Convert turfs to use it (#5004)
2018-03-05 19:43:23 -06:00
atmo_control.dm
…
autolathe_vr.dm
…
autolathe.dm
…
Beacon.dm
Arranges lots of things into planes (#5072)
2018-03-28 12:59:12 -07:00
biogenerator.dm
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16
2018-02-17 00:35:29 -05:00
bioprinter.dm
…
bomb_tester_vr.dm
…
buttons.dm
…
CableLayer.dm
…
cell_charger.dm
…
cloning.dm
…
constructable_frame.dm
…
cryo.dm
Arranges lots of things into planes (#5072)
2018-03-28 12:59:12 -07:00
cryopod_vr.dm
…
cryopod.dm
POLARIS: Fixes #3237 (VS) - Cryoconsoles are lit even when unpowered
2018-03-25 17:02:55 -04:00
deployable.dm
…
door_control.dm
…
doorbell_vr.dm
…
doppler_array.dm
…
exonet_node.dm
…
flasher.dm
…
floodlight.dm
…
floor_light.dm
…
floorlayer.dm
…
frame.dm
Switch frame construction menu to have a cancel button.
2018-04-11 21:52:34 -04:00
hologram.dm
…
holosign.dm
Arranges lots of things into planes (#5072)
2018-03-28 12:59:12 -07:00
igniter.dm
…
iv_drip.dm
…
jukebox.dm
Adds my recent ambient track to the jukebox
2018-04-05 20:51:41 -07:00
lightswitch.dm
…
machinery.dm
Arranges lots of things into planes (#5072)
2018-03-28 12:59:12 -07:00
magnet.dm
Arranges lots of things into planes (#5072)
2018-03-28 12:59:12 -07:00
mass_driver.dm
…
navbeacon.dm
Arranges lots of things into planes (#5072)
2018-03-28 12:59:12 -07:00
newscaster.dm
Fixes wallet-HUD interaction issues. (#5130)
2018-04-01 22:46:13 -05:00
nuclear_bomb.dm
…
OpTable.dm
POLARIS: Ports Bay's wall-mounted air pumps
2018-02-18 13:24:23 -06:00
overview.dm
Arranges lots of things into planes (#5072)
2018-03-28 12:59:12 -07:00
oxygen_pump.dm
Improve Destroy() on oxygen_pump
2018-02-19 16:57:54 -05:00
painter_vr.dm
Squashed commit of the following:
2018-04-10 21:27:47 +03:00
partslathe_vr.dm
…
pda_multicaster.dm
…
portable_turret.dm
Constructs 2.0 - Living Stone (#5040)
2018-04-04 23:45:00 -07:00
recharger.dm
…
rechargestation.dm
POLARIS: Another recharger fix
2018-03-21 16:13:16 -04:00
records_scanner.dm
…
requests_console_vr.dm
…
requests_console.dm
…
robot_fabricator.dm
…
seed_extractor.dm
…
Sleeper.dm
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16
2018-02-17 00:35:29 -05:00
spaceheater.dm
…
status_display_ai.dm
…
status_display.dm
…
suit_storage_unit_vr.dm
…
suit_storage_unit.dm
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15
2018-03-15 22:41:14 -04:00
supply_display.dm
…
supplybeacon.dm
…
syndicatebeacon.dm
…
teleporter.dm
…
transformer.dm
…
transportpod.dm
…
turret_control.dm
…
vending_vr.dm
Adds quickdraw objects and syringe cases
2018-03-04 18:58:34 -06:00
vending.dm
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04
2018-04-06 15:40:06 -04:00
vr_console.dm
…
wall_frames.dm
Switch frame construction menu to have a cancel button.
2018-04-11 21:52:34 -04:00
washing_machine.dm
…
wishgranter.dm
…