cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 12:08:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1497 from VOREStation/aro-tether-wip

Browse Source 
Various Tether Fixes
This commit is contained in:
Arokha Sieyes
2017-05-21 00:35:52 -04:00
committed by GitHub
parent 3a856f5bad 1ef025a283
commit d3d180f739
11 changed files with 5588 additions and 5574 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/cryopod_vr.dm
+2 -1
View File
@@ -22,7 +22,7 @@
/obj/machinery/computer/cryopod/gateway
name = "teleport oversight console"
desc = "An interface between visitors and the teleport oversight systems tasked with keeping track of all visitors who enter or exit from the teleporters."
/* VOREStation Edit
/obj/machinery/cryopod/robot/door/dorms
desc = "A small elevator that goes down to the residential district."
on_enter_occupant_message = "The elevator door closes slowly, ready to bring you down to the residential district."
@@ -31,3 +31,4 @@
/obj/machinery/computer/cryopod/dorms
name = "residential oversight console"
desc = "An interface between visitors and the residential oversight systems tasked with keeping track of all visitors in the residential district."
*/
code/game/objects/items/weapons/storage/boxes.dm
+4
View File
@@ -52,6 +52,10 @@
new foldable(get_turf(src))
qdel(src)
/obj/item/weapon/storage/box/survival //VOREStation Add for Tether Size boxes
max_w_class = ITEMSIZE_NORMAL
max_storage_space = 6 //This is just the right number, there's no constant.
/obj/item/weapon/storage/box/survival/New()
..()
new /obj/item/clothing/mask/gas(src) // VOREStation Edit - Tether
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+1 -1
View File
@@ -46,7 +46,7 @@
new /obj/item/clothing/gloves/sterile/latex(src)
new /obj/item/device/radio/headset/heads/rd(src)
new /obj/item/device/radio/headset/heads/rd/alt(src)
new /obj/item/weapon/bluespace_harpoon //VOREStation Edit
new /obj/item/weapon/bluespace_harpoon(src) //VOREStation Edit
new /obj/item/weapon/tank/air(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/device/flash(src)
code/modules/client/preferences_spawnpoints.dm
+2 -2
View File
@@ -37,7 +37,7 @@ var/list/spawntypes = list()
/datum/spawnpoint/gateway/New()
..()
turfs = latejoin_gateway
/* VOREStation Edit
/datum/spawnpoint/elevator
display_name = "Elevator"
msg = "has arrived from the residential district"
@@ -45,7 +45,7 @@ var/list/spawntypes = list()
/datum/spawnpoint/elevator/New()
..()
turfs = latejoin_elevator
*/
/datum/spawnpoint/cryo
display_name = "Cryogenic Storage"
msg = "has completed cryogenic revival"
code/modules/holomap/holomap_area.dm
+2
View File
@@ -33,6 +33,8 @@
/area/engineering
holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
/area/engineering/atmos/intake
holomap_color = null
/area/maintenance/substation/engineering
holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
/area/storage/tech
code/modules/vore/persist/persist_vr.dm
+3 -3
View File
@@ -24,15 +24,15 @@
if(O.started_as_observer)
continue // They are just a pure observer, ignore
// Died and were not cloned - Respawn at centcomm
persist_interround_data(Player, /datum/spawnpoint/arrivals)
persist_interround_data(Player, /datum/spawnpoint/tram)
else
var/turf/playerTurf = get_turf(Player)
if(isAdminLevel(playerTurf.z))
// Evac'd - Next round they arrive on the shuttle.
persist_interround_data(Player, /datum/spawnpoint/arrivals)
persist_interround_data(Player, /datum/spawnpoint/tram)
else
// Stayed on station, go to dorms
persist_interround_data(Player, /datum/spawnpoint/elevator)
persist_interround_data(Player, /datum/spawnpoint/cryo)
return 1
/**
maps/tether/tether-01-surface.dmm
+2605 -2602
View File
File diff suppressed because it is too large Load Diff
maps/tether/tether-03-station.dmm
+2959 -2956
View File
File diff suppressed because it is too large Load Diff
maps/tether/tether-04-mining.dmm
+8 -8
View File
@@ -60,7 +60,7 @@
"bh" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/machinery/atmospherics/pipe/simple/visible/supply{dir = 9},/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,/turf/simulated/floor/tiled/techfloor,/area/outpost/engineering/atmospherics)
"bi" = (/obj/structure/table/glass,/obj/machinery/microwave,/obj/effect/floor_decal/borderfloor{dir = 10},/obj/effect/floor_decal/corner/brown/border{dir = 10},/obj/effect/floor_decal/borderfloor/corner2{dir = 8},/obj/effect/floor_decal/corner/brown/bordercorner2{dir = 8},/turf/simulated/floor/tiled,/area/outpost/mining_main/break_room)
"bj" = (/obj/structure/table/glass,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/obj/item/weapon/storage/box/cups{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/box/donkpockets,/turf/simulated/floor/tiled,/area/outpost/mining_main/break_room)
"bk" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/turf/simulated/floor/tiled,/area/outpost/mining_main/break_room)
"bk" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/obj/structure/closet/hydrant{pixel_y = -32},/turf/simulated/floor/tiled,/area/outpost/mining_main/break_room)
"bl" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/borderfloor/corner{dir = 8},/obj/effect/floor_decal/corner/brown/bordercorner{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/outpost/mining_main/break_room)
"bm" = (/turf/simulated/floor/tiled/steel_grid,/area/outpost/mining_main/break_room)
"bn" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/brown/border{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/obj/structure/closet/excavation,/obj/item/weapon/storage/bag/ore,/turf/simulated/floor/tiled,/area/outpost/mining_main/passage)
@@ -87,13 +87,13 @@
"bI" = (/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled/techfloor,/area/outpost/engineering/atmospherics)
"bJ" = (/turf/simulated/floor/tiled/techfloor,/area/outpost/engineering/atmospherics)
"bK" = (/obj/structure/table/standard,/obj/item/weapon/storage/briefcase/inflatable,/turf/simulated/floor/tiled/techfloor,/area/outpost/engineering/atmospherics)
"bL" = (/obj/structure/table/woodentable,/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/machinery/alarm{pixel_y = 22},/turf/simulated/floor/holofloor/wood,/area/outpost/mining_main/dorms)
"bM" = (/obj/structure/cable/green{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/machinery/light_switch{dir = 1; pixel_x = 12; pixel_y = 24},/turf/simulated/floor/holofloor/wood,/area/outpost/mining_main/dorms)
"bN" = (/obj/machinery/door/airlock/mining,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled,/area/outpost/mining_main/dorms)
"bL" = (/obj/structure/table/woodentable,/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/machinery/alarm{pixel_y = 22},/turf/simulated/floor/wood,/area/outpost/mining_main/dorms)
"bM" = (/obj/structure/cable/green{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/machinery/light_switch{dir = 1; pixel_x = 12; pixel_y = 24},/turf/simulated/floor/wood,/area/outpost/mining_main/dorms)
"bN" = (/obj/machinery/door/airlock/mining,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/wood,/area/outpost/mining_main/dorms)
"bO" = (/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/turf/simulated/floor/tiled/steel_grid,/area/outpost/mining_main/break_room)
"bP" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/steel_grid,/area/outpost/mining_main/break_room)
"bQ" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/access_button{command = "cycle_interior"; frequency = 1379; master_tag = "mining_outpost_airlock"; name = "Mining Outpost Access Button"; pixel_x = 0; pixel_y = 24; req_access = list(48,54)},/obj/machinery/door/airlock/external{frequency = 1379; icon_state = "door_locked"; id_tag = "mining_outpost_airlock_inner"; locked = 1},/turf/simulated/floor/tiled/steel_grid,/area/outpost/mining_main/break_room)
"bR" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/borderfloorblack/cee{dir = 8},/obj/effect/floor_decal/corner/brown/bordercee{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/universal{dir = 8},/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/airlock)
"bR" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/borderfloorblack/cee{dir = 8},/obj/effect/floor_decal/corner/brown/bordercee{dir = 4},/obj/machinery/atmospherics/pipe/simple/visible/universal{dir = 4},/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/airlock)
"bS" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/borderfloorblack{dir = 1},/obj/effect/floor_decal/corner/brown/border,/obj/effect/floor_decal/corner/brown/border{dir = 1},/obj/machinery/atmospherics/binary/pump/on{dir = 4; name = "Airlock Refill"; target_pressure = 3800},/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/airlock)
"bT" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/borderfloorblack{dir = 1},/obj/effect/floor_decal/corner/brown/border,/obj/effect/floor_decal/corner/brown/border{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{dir = 1},/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/airlock)
"bU" = (/obj/effect/floor_decal/borderfloorblack,/obj/effect/floor_decal/borderfloorblack{dir = 1},/obj/effect/floor_decal/corner/brown/border,/obj/effect/floor_decal/corner/brown/border{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/cyan{dir = 4},/obj/machinery/meter,/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/airlock)
@@ -101,11 +101,11 @@
"bW" = (/obj/machinery/access_button{command = "cycle_exterior"; dir = 2; frequency = 1379; master_tag = "mining_outpost_airlock"; name = "Mining Outpost Access Button"; pixel_x = 0; pixel_y = 24; req_access = list(48,54)},/obj/machinery/door/airlock/external{frequency = 1379; icon_state = "door_locked"; id_tag = "mining_outpost_airlock_outer"; locked = 1},/turf/simulated/floor/tiled/steel_grid,/area/outpost/mining_main/airlock)
"bX" = (/obj/effect/floor_decal/techfloor{dir = 8},/obj/structure/closet/crate,/obj/item/stack/material/phoron{amount = 50},/obj/item/stack/material/phoron{amount = 50},/obj/item/stack/material/phoron{amount = 50},/obj/item/stack/material/phoron{amount = 50},/obj/item/stack/material/phoron{amount = 50},/obj/item/stack/material/phoron{amount = 50},/turf/simulated/floor/tiled/techfloor,/area/outpost/engineering/atmospherics)
"bY" = (/obj/machinery/power/port_gen/pacman,/obj/structure/cable/yellow,/turf/simulated/floor/tiled/techfloor,/area/outpost/engineering/atmospherics)
"bZ" = (/obj/structure/closet/firecloset,/turf/simulated/floor/tiled/techfloor,/area/outpost/engineering/atmospherics)
"bZ" = (/obj/machinery/telecomms/relay/preset/mining,/turf/simulated/floor/tiled/techfloor,/area/outpost/engineering/atmospherics)
"ca" = (/obj/machinery/washing_machine,/turf/simulated/floor/tiled/techfloor,/area/outpost/engineering/atmospherics)
"cb" = (/obj/structure/table/standard,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/tiled/techfloor,/area/outpost/engineering/atmospherics)
"cc" = (/obj/item/weapon/bedsheet/orange,/obj/structure/bed,/turf/simulated/floor/holofloor/wood,/area/outpost/mining_main/dorms)
"cd" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/holofloor/wood,/area/outpost/mining_main/dorms)
"cc" = (/obj/item/weapon/bedsheet/orange,/obj/structure/bed,/turf/simulated/floor/wood,/area/outpost/mining_main/dorms)
"cd" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/wood,/area/outpost/mining_main/dorms)
"ce" = (/obj/effect/floor_decal/borderfloor{dir = 10},/obj/effect/floor_decal/corner/brown/border{dir = 10},/obj/effect/floor_decal/borderfloor/corner2{dir = 8},/obj/effect/floor_decal/corner/brown/bordercorner2{dir = 8},/obj/machinery/vending/cola,/turf/simulated/floor/tiled,/area/outpost/mining_main/break_room)
"cf" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/obj/machinery/vending/coffee,/turf/simulated/floor/tiled,/area/outpost/mining_main/break_room)
"cg" = (/obj/effect/floor_decal/borderfloor{dir = 6},/obj/effect/floor_decal/corner/brown/border{dir = 6},/obj/effect/floor_decal/borderfloor/corner2{dir = 6},/obj/effect/floor_decal/corner/brown/bordercorner2{dir = 6},/obj/machinery/vending/snack,/turf/simulated/floor/tiled,/area/outpost/mining_main/break_room)
maps/tether/tether_shuttles.dm
+1
View File
@@ -1,6 +1,7 @@
/obj/machinery/computer/shuttle_control/tether_backup
name = "tether backup shuttle control console"
shuttle_tag = "Tether Backup"
req_one_access = list(access_heads)
/obj/machinery/computer/shuttle_control/multi/tether_antag_ground
name = "land crawler control console"
maps/tether/tether_things.dm
+1 -1
View File
@@ -167,7 +167,7 @@
var/mob/living/carbon/human/user = AM
var/choice = alert("Do you want to depart via the tram? Your character will leave the round.","Departure","Yes","No")
if(choice == "Yes")
if(user && choice == "Yes")
user.ghostize()
despawn_occupant(user)