From 78d3f43b10c26dab190a5cec498583e896866b7d Mon Sep 17 00:00:00 2001 From: Heroman Date: Tue, 20 Aug 2019 07:56:11 +1000 Subject: [PATCH 1/2] Emergency fixes --- code/game/gamemodes/gameticker.dm | 2 +- maps/tether/tether-07-station3.dmm | 112 ++++++++++++++--------------- 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 56d12d6f061..eb2a88b4979 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -284,7 +284,7 @@ var/global/datum/controller/gameticker/ticker var/mob/living/carbon/human/new_char = player.create_character() if(new_char) qdel(player) - if(istype(new_char) && !new_char.mind.assigned_role=="Cyborg") + if(istype(new_char) && !(new_char.mind.assigned_role=="Cyborg")) data_core.manifest_inject(new_char) //VOREStation Edit End diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index b647d36f91c..5eb0745853b 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -1969,6 +1969,21 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) +"di" = ( +/obj/machinery/meter, +/obj/machinery/alarm{ + frequency = 1441; + pixel_y = 22 + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/floodlight, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) "dj" = ( /turf/simulated/wall/thull, /area/shuttle/excursion/tether) @@ -2134,6 +2149,10 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/maintenance/station/sec_upper) +"dB" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) "dC" = ( /obj/structure/bed/chair/comfy/blue{ icon_state = "comfychair_preview"; @@ -2447,6 +2466,27 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) +"dZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 4 + }, +/obj/machinery/door/airlock/glass_external{ + icon_state = "door_locked"; + id_tag = "expshuttle_door_cargo"; + locked = 1 + }, +/obj/machinery/button/remote/airlock{ + desiredstate = 1; + dir = 4; + icon_state = "doorctrl0"; + id = "expshuttle_door_cargo"; + name = "hatch bolt control"; + pixel_x = -32; + req_one_access = list(); + specialfunctions = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/excursion/tether) "ea" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -2641,6 +2681,11 @@ }, /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) +"er" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/excursion/tether) "es" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/railing{ @@ -28417,11 +28462,6 @@ }, /turf/simulated/floor/tiled/white, /area/security/security_bathroom) -"SY" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/floor/reinforced, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/excursion/tether) "Tc" = ( /obj/structure/handrail{ dir = 4 @@ -28930,27 +28970,6 @@ /obj/item/weapon/reagent_containers/food/snacks/liquidprotein, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) -"Vh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 4 - }, -/obj/machinery/door/airlock/glass_external{ - icon_state = "door_locked"; - id_tag = "expshuttle_door_cargo"; - locked = 1 - }, -/obj/machinery/button/remote/airlock{ - desiredstate = 1; - dir = 4; - icon_state = "doorctrl0"; - id = "expshuttle_door_cargo"; - name = "hatch bolt control"; - pixel_x = -32; - req_one_access = list(19,43,67); - specialfunctions = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/excursion/tether) "Vi" = ( /obj/machinery/shuttle_sensor{ dir = 2; @@ -28958,11 +28977,6 @@ }, /turf/simulated/wall/thull, /area/shuttle/excursion/tether) -"Vl" = ( -/obj/machinery/floodlight, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/excursion/tether) "Vm" = ( /obj/structure/bed/chair/shuttle{ icon_state = "shuttle_chair"; @@ -29623,20 +29637,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) -"ZG" = ( -/obj/machinery/meter, -/obj/machinery/alarm{ - frequency = 1441; - pixel_y = 22 - }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/excursion/tether) "ZL" = ( /obj/machinery/door/airlock/hatch{ req_one_access = list(67) @@ -40539,7 +40539,7 @@ Zy WG dj XA -SY +er ms Oz be @@ -40681,7 +40681,7 @@ UJ Xb dj XN -SY +er ms Xq be @@ -40823,7 +40823,7 @@ kn WS dj XN -SY +er ms Vb be @@ -41106,7 +41106,7 @@ jZ WR Xo XN -SY +er cK ms Xq @@ -41388,8 +41388,8 @@ Za SO Zo Xi -Vl -Vh +dB +dZ Tc cK ms @@ -41674,7 +41674,7 @@ ea kx dj XN -SY +er cK ms mq @@ -41949,7 +41949,7 @@ dj eg Xl dj -ZG +di VR UW gM @@ -41959,7 +41959,7 @@ kQ TG dj XN -SY +er ms nA be @@ -42101,7 +42101,7 @@ kR Vd dj XN -SY +er ms QL be @@ -42243,7 +42243,7 @@ ZE ZB dj XB -SY +er ms Sq be From 313054ecc2ae0c7449bdb053ee46e3a497965e72 Mon Sep 17 00:00:00 2001 From: Heroman Date: Tue, 20 Aug 2019 08:28:35 +1000 Subject: [PATCH 2/2] Fixes the wasp taurhalf being broken --- icons/mob/vore/taurs_vr.dmi | Bin 77636 -> 77689 bytes maps/tether/tether-07-station3.dmm | 5 +++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/icons/mob/vore/taurs_vr.dmi b/icons/mob/vore/taurs_vr.dmi index 476ab75eb305e0d12dd2fe44371b2b18e842ff01..568523a47ca640d32494d29b93b80728d3fabc5d 100644 GIT binary patch delta 3897 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 IYFUT=4=(q!ga7~l delta 3752 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 BbZ-Cv diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 5eb0745853b..d7618eda391 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -2473,7 +2473,8 @@ /obj/machinery/door/airlock/glass_external{ icon_state = "door_locked"; id_tag = "expshuttle_door_cargo"; - locked = 1 + locked = 1; + req_one_access = list() }, /obj/machinery/button/remote/airlock{ desiredstate = 1; @@ -2482,7 +2483,7 @@ id = "expshuttle_door_cargo"; name = "hatch bolt control"; pixel_x = -32; - req_one_access = list(); + req_one_access = list(19,43,67); specialfunctions = 4 }, /turf/simulated/floor/tiled/techfloor/grid,