cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
fd46ebb51aeba66abfe44b0477ccd2ce751bce0f
CHOMPStation2/code/game/machinery
History
Nadyr 60ea7cbadc Merge pull request #908 from CHOMPStationBot/upstream-merge-9351 
[MIRROR] adjusts stage plane
2020-11-28 05:07:13 -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 #9342 from Shadow-Quill/IDRestoreEarlyReturn
2020-11-23 04:56:04 +00:00
computer3/computers
Site Management lookover for _vr stuff
2020-08-29 05:22:52 +10:00
doors
Removing a comment
2020-11-02 21:11:10 -05:00
embedded_controller
Merge pull request #9225 from VOREStation/upstream-merge-7708
2020-10-27 08:16:29 +00:00
event
Merge pull request #9351 from Very-Soft/stagefiddling
2020-11-24 00:39:00 +00:00
pipe
Fixing conflicts
2020-10-05 18:10:53 -07:00
reagents
Reagent Hoses
2020-08-20 21:24:06 -04:00
telecomms
September 2020 Upstream Merge
2020-09-25 23:07:08 -07:00
virtual_reality
…
adv_med_vr.dm
…
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
…
autolathe.dm
Fixing conflicts
2020-10-05 18:10:53 -07: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.dm
Merge pull request #9225 from VOREStation/upstream-merge-7708
2020-10-27 08:16:29 +00:00
CableLayer.dm
…
casino_ch.dm
…
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
…
cryopod_vr.dm
…
cryopod.dm
TGUI Civilian
2020-09-02 13:32:42 -07:00
deployable_vr.dm
…
deployable.dm
Convert /material to /datum/material
2020-09-27 16:16:44 -07:00
door_control.dm
…
doorbell_vr.dm
…
doppler_array.dm
Fix doppler array iconstates (#7581)
2020-08-30 02:52:33 -04:00
exonet_node.dm
…
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
…
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
…
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
…
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
Merge pull request #9225 from VOREStation/upstream-merge-7708
2020-10-27 08:16:29 +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
Fixing conflicts
2020-10-05 18:10:53 -07: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
…
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
…
spaceheater.dm
…
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
…
teleporter.dm
Fixing conflicts
2020-10-05 18:10:53 -07:00
transformer.dm
…
transportpod.dm
…
turret_control.dm
TGUI Porta Turrets
2020-09-18 02:51:08 -07:00
vending_machines_vr.dm
Update vending_machines_vr.dm
2020-11-11 18:58:16 -07:00
vending_machines.dm
Merge pull request #717 from CHOMPStationBot/upstream-merge-9229
2020-10-28 05:57:36 -04: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
…