cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
d94e59feea2d5193e140dace09633108a6bc853c
CHOMPStation2/code/game/machinery
History
Nadyr d94e59feea Merge pull request #1548 from CHOMPStationBot/upstream-merge-9871 
[MIRROR] [MIRROR] The Arcade Machine Update
2021-03-10 01:48:25 -05:00
..
atmoalter
Merge pull request #9071 from VOREStation/upstream-merge-7660
2020-09-21 16:54:29 -04:00
camera
Fixing conflicts
2020-10-05 18:10:53 -07:00
computer
Merge pull request #1548 from CHOMPStationBot/upstream-merge-9871
2021-03-10 01:48:25 -05:00
computer3/computers
Site Management lookover for _vr stuff
2020-08-29 05:22:52 +10:00
doors
[MIRROR] Ports TGUI Security Stuff
2021-03-09 22:18:36 +00:00
embedded_controller
Merge pull request #9225 from VOREStation/upstream-merge-7708
2020-10-27 08:16:29 +00:00
event
Christmas time is once a year..
2020-12-17 17:20:24 +01:00
pipe
Fixing conflicts
2020-10-05 18:10:53 -07:00
reagents
Reagent Hoses
2020-08-20 21:24:06 -04:00
telecomms
Revert "Fix ghost double comms with new link allinone"
2021-03-05 14:00:51 -08:00
virtual_reality
…
adv_med_vr.dm
TGUI'ified Medical Everything
2020-07-25 00:44:51 -07:00
adv_med.dm
Rebase onto Master for Volume Control Panel, Squash Commits
2020-08-27 19:47:38 -04:00
ai_slipper.dm
…
air_alarm.dm
Merge pull request #9225 from VOREStation/upstream-merge-7708
2020-10-27 08:16:29 +00:00
airconditioner_vr.dm
…
airconditioner_yw.dm
…
atmo_control.dm
TGUI Engineering: Squashed Edition (Commits Below)
2020-08-09 04:46:31 -07:00
autolathe.dm
[MIRROR] Industrial Expansion
2021-03-09 21:53:03 +00:00
Beacon.dm
…
biogenerator.dm
Update biogenerator.dm
2020-08-25 20:43:44 -04:00
bioprinter.dm
…
bomb_tester_vr.dm
also updates the tile/meter conversion
2020-09-04 14:42:27 +03:00
buttons_vr.dm
Merge pull request #9400 from Little-119/tintable-doors-two-electric-boogaloo
2020-12-03 02:48:31 +00:00
buttons.dm
Merge pull request #9400 from Little-119/tintable-doors-two-electric-boogaloo
2020-12-03 02:48:31 +00:00
CableLayer.dm
…
casino_ch.dm
Christmas time is once a year..
2020-12-17 17:20:24 +01:00
casino_prize_dispenser_ch.dm
So this is Christmas...
2020-12-15 01:43:30 +01:00
cell_charger.dm
…
cloning.dm
Rebase onto Master for Volume Control Panel, Squash Commits
2020-08-27 19:47:38 -04:00
constructable_frame.dm
…
cryo.dm
TGUI Backend Tweaks & Fixes
2020-08-07 00:29:50 -07:00
cryopod_vr.dm
…
cryopod.dm
TGUI Civilian
2020-09-02 13:32:42 -07:00
deployable_vr.dm
VS: Port Bay's lockers and stuff
2020-05-31 12:26:00 -04:00
deployable.dm
Merge pull request #9573 from VOREStation/upstream-merge-7786
2021-01-24 06:55:05 +00:00
door_control.dm
i think this is all the changes ?
2020-07-27 20:59:20 -03:00
doorbell_vr.dm
…
doppler_array.dm
Fix doppler array iconstates (#7581)
2020-08-30 02:52:33 -04:00
exonet_node.dm
TGUI Engineering: Squashed Edition (Commits Below)
2020-08-09 04:46:31 -07:00
feeder.dm
Update code/game/machinery/feeder.dm
2020-11-04 03:06:18 -07:00
fire_alarm.dm
Merge pull request #9225 from VOREStation/upstream-merge-7708
2020-10-27 08:16:29 +00:00
flasher.dm
Merge pull request #9225 from VOREStation/upstream-merge-7708
2020-10-27 08:16:29 +00:00
floodlight.dm
…
floor_light.dm
…
floorlayer.dm
…
frame.dm
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-07-25 15:22:42 +02:00
hologram.dm
…
holoposter.dm
…
holosign.dm
…
igniter.dm
Merge pull request #9225 from VOREStation/upstream-merge-7708
2020-10-27 08:16:29 +00:00
iv_drip.dm
blood mechanics tweaks (#7377)
2020-07-31 04:54:11 -04:00
jukebox_ch.dm
…
jukebox.dm
Fixing conflicts
2020-10-05 18:10:53 -07:00
lightswitch.dm
Merge pull request #9225 from VOREStation/upstream-merge-7708
2020-10-27 08:16:29 +00:00
machinery_power.dm
…
machinery.dm
Merge pull request #9455 from VOREStation/upstream-merge-7784
2020-12-14 03:05:22 +00:00
magnet.dm
…
mass_driver.dm
…
navbeacon.dm
…
neonsign.dm
Merge pull request #9225 from VOREStation/upstream-merge-7708
2020-10-27 08:16:29 +00:00
newscaster.dm
[MIRROR] Lobby Improvements
2021-03-09 22:32:57 +00:00
nuclear_bomb.dm
…
OpTable.dm
…
overview.dm
…
oxygen_pump.dm
TGUI Oxygen/Anesthetic Pump
2020-09-19 15:00:16 -07:00
painter_vr.dm
TGUI Civilian
2020-09-02 13:32:42 -07:00
partslathe_vr.dm
NanoUI Goes To Brazil
2020-09-20 02:36:46 -07:00
pda_multicaster.dm
TGUI PDAs Finale (minus newscaster)
2020-09-16 21:31:50 -07:00
pointdefense.dm
Properly centers projectile/beam icons
2021-02-10 22:12:32 +00:00
portable_turret_vr.dm
Merge pull request #9349 from Novacat/nova-basicfixes
2020-11-23 22:19:11 +00:00
portable_turret.dm
TGUI Porta Turrets
2020-09-18 02:51:08 -07:00
recharger.dm
Fixing conflicts
2020-10-05 18:10:53 -07:00
rechargestation.dm
Merge pull request #9453 from Hatterhat/polaris-7785-earlyport
2020-12-14 03:20:04 +00:00
records_scanner.dm
…
requests_console_vr.dm
…
requests_console.dm
Merge pull request #9225 from VOREStation/upstream-merge-7708
2020-10-27 08:16:29 +00:00
robot_fabricator.dm
…
seed_extractor.dm
TGUI Research
2020-08-25 13:30:47 -07:00
Sleeper.dm
[MIRROR] Sideports a couple of init unit tests from Neb.
2021-02-27 18:45:36 +00:00
spaceheater.dm
TGUI Engineering: Squashed Edition (Commits Below)
2020-08-09 04:46:31 -07:00
status_display_ai.dm
Merge pull request #9225 from VOREStation/upstream-merge-7708
2020-10-27 08:16:29 +00:00
status_display.dm
Merge pull request #9225 from VOREStation/upstream-merge-7708
2020-10-27 08:16:29 +00:00
suit_storage_unit_vr.dm
Fixing conflicts
2020-10-05 18:10:53 -07:00
suit_storage_unit_yw.dm
…
suit_storage_unit.dm
Fixing conflicts
2020-10-05 18:10:53 -07:00
supply_display.dm
…
supplybeacon.dm
…
syndicatebeacon_vr.dm
…
syndicatebeacon.dm
i think this is all the changes ?
2020-07-27 20:59:20 -03:00
telecrystal_storage_ch.dm
Fix stuff and give name
2021-01-29 21:46:00 -08:00
teleporter.dm
Fixing conflicts
2020-10-05 18:10:53 -07:00
transformer.dm
…
transportpod.dm
[MIRROR] Sideports a couple of init unit tests from Neb.
2021-02-27 18:45:36 +00:00
turret_control.dm
TGUI Porta Turrets
2020-09-18 02:51:08 -07:00
vending_machines_vr.dm
Remove duplicate vendors
2021-02-25 03:43:24 -07:00
vending_machines.dm
Update vending_machines.dm
2021-01-03 21:37:45 -05:00
vending_yw.dm
…
vending.dm
Merge pull request #9346 from ShadowLarkens/patch-1
2020-11-23 15:22:27 +00:00
vitals_monitor.dm
NanoUI Goes To Brazil
2020-09-20 02:36:46 -07:00
wall_frames.dm
…
washing_machine.dm
[MIRROR] Fresh Meat, Leatherworking
2020-11-08 17:04:32 +00:00
wishgranter.dm
…