cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-05 13:50:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
090c9bd265bd5b02027f21cc924678072bdb931c
VOREStation/code/game/machinery
History
Leshana 27c3272821 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27 
# Conflicts:
#	code/ZAS/_docs.dm
#	code/__defines/mobs.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/game/turfs/simulated/walls.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/life.dm
#	code/modules/mob/living/living_defines.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	maps/southern_cross/southern_cross_jobs.dm
#	vorestation.dme
2018-01-27 23:08:53 -05:00
..
atmoalter
Merge remote-tracking branch 'polaris-upstream/master' commit '613c5984eeeed2757fe7f15877973f81f526323c' into polaris-sync-2018-01-10
2018-01-15 13:27:39 -05:00
camera
Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04
2018-01-04 22:44:04 -05:00
computer
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27
2018-01-27 23:08:53 -05:00
computer3
Planes Framework (#4545)
2018-01-17 13:45:54 -06:00
doors
Stop airlocks from sleeping during machine controller process() execution.
2018-01-08 22:05:20 -05:00
embedded_controller
Fixes all the other stuff
2017-10-15 20:56:13 -04:00
kitchen
Microwave is no longer a proper noun. (#3873)
2017-09-18 00:22:18 -05:00
pipe
Revert accidental commit of a WIP file.
2018-01-21 21:01:30 -05:00
telecomms
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync2018
2017-12-26 23:07:58 -05:00
adv_med_vr.dm
…
adv_med.dm
Polaris sync
2017-12-21 04:01:07 -05:00
ai_slipper.dm
…
airconditioner_vr.dm
Constructability.
2017-09-15 21:52:35 -04:00
alarm.dm
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27
2018-01-27 23:08:53 -05:00
atmo_control.dm
Fixes all the other stuff
2017-10-15 20:56:13 -04:00
autolathe_vr.dm
…
autolathe.dm
Polaris Sync
2017-11-04 13:37:13 -04:00
Beacon.dm
…
biogenerator.dm
Oxygen Generator improvements
2017-11-28 22:05:28 -05:00
bioprinter.dm
Printed limbs now have species and skin color
2017-09-23 17:31:09 -05:00
bomb_tester_vr.dm
Adds plasma research outpost.
2017-09-29 02:28:43 -04:00
buttons.dm
…
CableLayer.dm
Updates Tools
2017-08-03 04:49:23 -04:00
cell_charger.dm
Updates Tools
2017-08-03 04:49:23 -04:00
cloning.dm
Allows Prometheans to be cloned from their Core. (#4602)
2018-01-24 18:19:32 -06:00
constructable_frame.dm
Updates Tools
2017-08-03 04:49:23 -04:00
cryo.dm
Updates misc atmospherics machinery init and destroy.
2018-01-09 15:23:17 -05:00
cryopod_vr.dm
…
cryopod.dm
Despawn NIF occupants in cryo
2018-01-08 13:59:52 -05:00
deployable.dm
Adds Variable Click Delay
2017-11-28 16:11:56 -05:00
door_control.dm
…
doorbell_vr.dm
…
doppler_array.dm
…
exonet_node.dm
More fixes
2017-10-15 19:54:50 -04:00
flasher.dm
…
floodlight.dm
…
floor_light.dm
Polaris sync
2017-08-06 19:07:17 -04:00
floorlayer.dm
…
frame.dm
Fix a last-minute typo
2017-12-27 20:20:15 -05:00
hologram.dm
Adds OOC prefs to AI holograms
2017-09-07 15:43:22 +12:00
holosign.dm
Adds signs.
2017-11-24 20:34:42 -05:00
igniter.dm
Updates Tools
2017-08-03 04:49:23 -04:00
iv_drip.dm
Updates Tools
2017-08-03 04:49:23 -04:00
jukebox.dm
Polaris sync
2017-08-06 19:07:17 -04:00
lightswitch.dm
Merge polaris sync 01 17 2018
2018-01-17 17:56:51 -05:00
machinery.dm
Implements the Tesla engine and supporting features (#4539)
2018-01-19 14:56:08 -06:00
magnet.dm
…
mass_driver.dm
…
navbeacon.dm
Updates Tools
2017-08-03 04:49:23 -04:00
newscaster.dm
Fixes up the PR.
2017-09-09 23:17:41 -04:00
nuclear_bomb.dm
Updates Tools
2017-08-03 04:49:23 -04:00
OpTable.dm
…
overview.dm
…
partslathe_vr.dm
…
pda_multicaster.dm
More fixes
2017-10-15 19:54:50 -04:00
portable_turret.dm
Fixes 'varient'
2018-01-08 16:42:20 -05:00
recharger.dm
Polaris sync
2017-10-27 15:30:24 -04:00
rechargestation.dm
You can now put people and borgs in rechargers
2017-11-26 19:37:56 -06:00
records_scanner.dm
grammar never ends (#4421)
2017-12-08 15:30:34 -06:00
requests_console_vr.dm
…
requests_console.dm
Polaris sync
2017-12-21 04:01:07 -05:00
robot_fabricator.dm
grammar never ends (#4421)
2017-12-08 15:30:34 -06:00
seed_extractor.dm
…
Sleeper.dm
Polaris sync
2017-12-21 04:01:07 -05:00
spaceheater.dm
Adds Farm PoI
2017-09-26 01:44:06 -04:00
status_display_ai.dm
Adds heart display.
2017-09-09 12:27:30 -04:00
status_display.dm
Port's TG's Maploader
2017-09-08 12:49:26 -04:00
suit_storage_unit_vr.dm
Revert "Chirret species"
2017-12-19 19:47:50 -05:00
suit_storage_unit.dm
Revert "Chirret species"
2017-12-19 19:47:50 -05:00
supply_display.dm
…
supplybeacon.dm
I before E (#4287)
2017-11-19 03:00:14 -06:00
syndicatebeacon.dm
Transformed the machinery processor into an StonedMC subsystem
2017-12-29 15:31:59 -05:00
teleporter.dm
grammar never ends (#4421)
2017-12-08 15:30:34 -06:00
transformer.dm
…
transportpod.dm
fuck 'usr <<' (#4245)
2017-11-21 15:22:05 -06:00
turret_control.dm
Turrets detect targets through metal foam.
2017-10-15 13:48:38 -07:00
vending_vr.dm
Merge polaris sync 01 17 2018
2018-01-17 17:56:51 -05:00
vending.dm
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync01222018
2018-01-22 12:10:19 -05:00
vr_console.dm
Polaris sync
2017-12-21 04:01:07 -05:00
wall_frames.dm
…
washing_machine.dm
…
wishgranter.dm
…