mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
Emergency fixes
This commit is contained in:
@@ -284,7 +284,7 @@ var/global/datum/controller/gameticker/ticker
|
|||||||
var/mob/living/carbon/human/new_char = player.create_character()
|
var/mob/living/carbon/human/new_char = player.create_character()
|
||||||
if(new_char)
|
if(new_char)
|
||||||
qdel(player)
|
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)
|
data_core.manifest_inject(new_char)
|
||||||
//VOREStation Edit End
|
//VOREStation Edit End
|
||||||
|
|
||||||
|
|||||||
@@ -1969,6 +1969,21 @@
|
|||||||
},
|
},
|
||||||
/turf/simulated/floor/tiled/monotile,
|
/turf/simulated/floor/tiled/monotile,
|
||||||
/area/tether/exploration)
|
/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" = (
|
"dj" = (
|
||||||
/turf/simulated/wall/thull,
|
/turf/simulated/wall/thull,
|
||||||
/area/shuttle/excursion/tether)
|
/area/shuttle/excursion/tether)
|
||||||
@@ -2134,6 +2149,10 @@
|
|||||||
/obj/structure/catwalk,
|
/obj/structure/catwalk,
|
||||||
/turf/simulated/floor,
|
/turf/simulated/floor,
|
||||||
/area/maintenance/station/sec_upper)
|
/area/maintenance/station/sec_upper)
|
||||||
|
"dB" = (
|
||||||
|
/obj/effect/floor_decal/industrial/warning,
|
||||||
|
/turf/simulated/floor/tiled/techfloor/grid,
|
||||||
|
/area/shuttle/excursion/tether)
|
||||||
"dC" = (
|
"dC" = (
|
||||||
/obj/structure/bed/chair/comfy/blue{
|
/obj/structure/bed/chair/comfy/blue{
|
||||||
icon_state = "comfychair_preview";
|
icon_state = "comfychair_preview";
|
||||||
@@ -2447,6 +2466,27 @@
|
|||||||
/obj/machinery/atmospherics/unary/vent_pump/on,
|
/obj/machinery/atmospherics/unary/vent_pump/on,
|
||||||
/turf/simulated/floor/tiled,
|
/turf/simulated/floor/tiled,
|
||||||
/area/shuttle/excursion/tether)
|
/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" = (
|
"ea" = (
|
||||||
/obj/structure/grille,
|
/obj/structure/grille,
|
||||||
/obj/structure/window/reinforced/full,
|
/obj/structure/window/reinforced/full,
|
||||||
@@ -2641,6 +2681,11 @@
|
|||||||
},
|
},
|
||||||
/turf/simulated/floor/tiled/dark,
|
/turf/simulated/floor/tiled/dark,
|
||||||
/area/security/security_lockerroom)
|
/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" = (
|
"es" = (
|
||||||
/obj/effect/decal/cleanable/dirt,
|
/obj/effect/decal/cleanable/dirt,
|
||||||
/obj/structure/railing{
|
/obj/structure/railing{
|
||||||
@@ -28417,11 +28462,6 @@
|
|||||||
},
|
},
|
||||||
/turf/simulated/floor/tiled/white,
|
/turf/simulated/floor/tiled/white,
|
||||||
/area/security/security_bathroom)
|
/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" = (
|
"Tc" = (
|
||||||
/obj/structure/handrail{
|
/obj/structure/handrail{
|
||||||
dir = 4
|
dir = 4
|
||||||
@@ -28930,27 +28970,6 @@
|
|||||||
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
|
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
|
||||||
/turf/simulated/floor/tiled/techfloor/grid,
|
/turf/simulated/floor/tiled/techfloor/grid,
|
||||||
/area/shuttle/excursion/tether)
|
/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" = (
|
"Vi" = (
|
||||||
/obj/machinery/shuttle_sensor{
|
/obj/machinery/shuttle_sensor{
|
||||||
dir = 2;
|
dir = 2;
|
||||||
@@ -28958,11 +28977,6 @@
|
|||||||
},
|
},
|
||||||
/turf/simulated/wall/thull,
|
/turf/simulated/wall/thull,
|
||||||
/area/shuttle/excursion/tether)
|
/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" = (
|
"Vm" = (
|
||||||
/obj/structure/bed/chair/shuttle{
|
/obj/structure/bed/chair/shuttle{
|
||||||
icon_state = "shuttle_chair";
|
icon_state = "shuttle_chair";
|
||||||
@@ -29623,20 +29637,6 @@
|
|||||||
},
|
},
|
||||||
/turf/simulated/floor/tiled/techfloor/grid,
|
/turf/simulated/floor/tiled/techfloor/grid,
|
||||||
/area/shuttle/excursion/tether)
|
/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" = (
|
"ZL" = (
|
||||||
/obj/machinery/door/airlock/hatch{
|
/obj/machinery/door/airlock/hatch{
|
||||||
req_one_access = list(67)
|
req_one_access = list(67)
|
||||||
@@ -40539,7 +40539,7 @@ Zy
|
|||||||
WG
|
WG
|
||||||
dj
|
dj
|
||||||
XA
|
XA
|
||||||
SY
|
er
|
||||||
ms
|
ms
|
||||||
Oz
|
Oz
|
||||||
be
|
be
|
||||||
@@ -40681,7 +40681,7 @@ UJ
|
|||||||
Xb
|
Xb
|
||||||
dj
|
dj
|
||||||
XN
|
XN
|
||||||
SY
|
er
|
||||||
ms
|
ms
|
||||||
Xq
|
Xq
|
||||||
be
|
be
|
||||||
@@ -40823,7 +40823,7 @@ kn
|
|||||||
WS
|
WS
|
||||||
dj
|
dj
|
||||||
XN
|
XN
|
||||||
SY
|
er
|
||||||
ms
|
ms
|
||||||
Vb
|
Vb
|
||||||
be
|
be
|
||||||
@@ -41106,7 +41106,7 @@ jZ
|
|||||||
WR
|
WR
|
||||||
Xo
|
Xo
|
||||||
XN
|
XN
|
||||||
SY
|
er
|
||||||
cK
|
cK
|
||||||
ms
|
ms
|
||||||
Xq
|
Xq
|
||||||
@@ -41388,8 +41388,8 @@ Za
|
|||||||
SO
|
SO
|
||||||
Zo
|
Zo
|
||||||
Xi
|
Xi
|
||||||
Vl
|
dB
|
||||||
Vh
|
dZ
|
||||||
Tc
|
Tc
|
||||||
cK
|
cK
|
||||||
ms
|
ms
|
||||||
@@ -41674,7 +41674,7 @@ ea
|
|||||||
kx
|
kx
|
||||||
dj
|
dj
|
||||||
XN
|
XN
|
||||||
SY
|
er
|
||||||
cK
|
cK
|
||||||
ms
|
ms
|
||||||
mq
|
mq
|
||||||
@@ -41949,7 +41949,7 @@ dj
|
|||||||
eg
|
eg
|
||||||
Xl
|
Xl
|
||||||
dj
|
dj
|
||||||
ZG
|
di
|
||||||
VR
|
VR
|
||||||
UW
|
UW
|
||||||
gM
|
gM
|
||||||
@@ -41959,7 +41959,7 @@ kQ
|
|||||||
TG
|
TG
|
||||||
dj
|
dj
|
||||||
XN
|
XN
|
||||||
SY
|
er
|
||||||
ms
|
ms
|
||||||
nA
|
nA
|
||||||
be
|
be
|
||||||
@@ -42101,7 +42101,7 @@ kR
|
|||||||
Vd
|
Vd
|
||||||
dj
|
dj
|
||||||
XN
|
XN
|
||||||
SY
|
er
|
||||||
ms
|
ms
|
||||||
QL
|
QL
|
||||||
be
|
be
|
||||||
@@ -42243,7 +42243,7 @@ ZE
|
|||||||
ZB
|
ZB
|
||||||
dj
|
dj
|
||||||
XB
|
XB
|
||||||
SY
|
er
|
||||||
ms
|
ms
|
||||||
Sq
|
Sq
|
||||||
be
|
be
|
||||||
|
|||||||
Reference in New Issue
Block a user