Goof: Freon isn't crashing the server, honest (#20703)

Everyone else: It lags like fuck the second someone opens a canister PAY UP
This commit is contained in:
Joan Lung
2016-09-26 22:50:21 -04:00
committed by oranges
parent 475cdc8845
commit fee08e60a7
4 changed files with 8 additions and 21 deletions

View File

@@ -12792,7 +12792,6 @@
pixel_x = 0; pixel_x = 0;
pixel_y = 0 pixel_y = 0
}, },
/obj/machinery/portable_atmospherics/canister/bz,
/turf/open/floor/plasteel/escape{ /turf/open/floor/plasteel/escape{
tag = "icon-escape (NORTH)"; tag = "icon-escape (NORTH)";
dir = 1 dir = 1
@@ -67446,7 +67445,6 @@
dir = 4; dir = 4;
network = list("SS13","Sci") network = list("SS13","Sci")
}, },
/obj/machinery/portable_atmospherics/canister/bz,
/turf/open/floor/plasteel/floorgrime, /turf/open/floor/plasteel/floorgrime,
/area/toxins/storage) /area/toxins/storage)
"cEh" = ( "cEh" = (
@@ -67983,7 +67981,6 @@
icon_state = "tube1"; icon_state = "tube1";
dir = 8 dir = 8
}, },
/obj/machinery/portable_atmospherics/canister/bz,
/turf/open/floor/plasteel/floorgrime, /turf/open/floor/plasteel/floorgrime,
/area/toxins/storage) /area/toxins/storage)
"cFh" = ( "cFh" = (

View File

@@ -24259,7 +24259,6 @@
/obj/machinery/camera{ /obj/machinery/camera{
c_tag = "Atmospherics Monitoring" c_tag = "Atmospherics Monitoring"
}, },
/obj/machinery/portable_atmospherics/canister/bz,
/turf/open/floor/plasteel/caution/corner{ /turf/open/floor/plasteel/caution/corner{
dir = 1 dir = 1
}, },
@@ -84341,7 +84340,7 @@ aze
aAw aAw
aBE aBE
aCO aCO
ckj aFp
aFn aFn
aGo aGo
aCO aCO

View File

@@ -47246,6 +47246,7 @@
/turf/open/floor/wood, /turf/open/floor/wood,
/area/library) /area/library)
"bDx" = ( "bDx" = (
/obj/machinery/portable_atmospherics/canister/nitrogen,
/turf/open/floor/plasteel/bot, /turf/open/floor/plasteel/bot,
/area/atmos) /area/atmos)
"bDy" = ( "bDy" = (
@@ -49974,7 +49975,6 @@
dir = 4 dir = 4
}, },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/portable_atmospherics/canister/freon,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/atmos) /area/atmos)
"bHQ" = ( "bHQ" = (
@@ -49985,7 +49985,6 @@
dir = 2; dir = 2;
on = 1 on = 1
}, },
/obj/machinery/portable_atmospherics/canister/freon,
/turf/open/floor/plasteel/black/corner{ /turf/open/floor/plasteel/black/corner{
dir = 2 dir = 2
}, },
@@ -73557,7 +73556,6 @@
dir = 2; dir = 2;
icon_state = "pipe-c" icon_state = "pipe-c"
}, },
/obj/machinery/portable_atmospherics/canister/freon,
/turf/open/floor/plasteel/warning{ /turf/open/floor/plasteel/warning{
dir = 4 dir = 4
}, },
@@ -74085,7 +74083,6 @@
/turf/open/floor/plasteel/bot, /turf/open/floor/plasteel/bot,
/area/toxins/storage) /area/toxins/storage)
"cxf" = ( "cxf" = (
/obj/machinery/portable_atmospherics/canister/freon,
/turf/open/floor/plasteel/warning{ /turf/open/floor/plasteel/warning{
dir = 8 dir = 8
}, },
@@ -74093,7 +74090,6 @@
"cxg" = ( "cxg" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment,
/obj/machinery/portable_atmospherics/canister/freon,
/turf/open/floor/plasteel/warning{ /turf/open/floor/plasteel/warning{
dir = 4 dir = 4
}, },
@@ -75357,7 +75353,6 @@
/obj/machinery/light_switch{ /obj/machinery/light_switch{
pixel_y = -23 pixel_y = -23
}, },
/obj/machinery/portable_atmospherics/canister/bz,
/turf/open/floor/plasteel/warning{ /turf/open/floor/plasteel/warning{
dir = 10 dir = 10
}, },
@@ -90633,8 +90628,9 @@
}, },
/area/shuttle/transport) /area/shuttle/transport)
"cZx" = ( "cZx" = (
/turf/closed/wall/mineral/titanium/overspace, /obj/machinery/portable_atmospherics/canister/nitrous_oxide,
/area/shuttle/abandoned) /turf/open/floor/plasteel/bot,
/area/atmos)
"cZy" = ( "cZy" = (
/turf/open/floor/plating/warnplate{ /turf/open/floor/plating/warnplate{
dir = 1 dir = 1
@@ -134571,7 +134567,7 @@ bEn
bHQ bHQ
bJz bJz
bKT bKT
bDx cZx
atw atw
cXn cXn
bRz bRz

View File

@@ -36591,7 +36591,6 @@
scrub_N2O = 0; scrub_N2O = 0;
scrub_Toxins = 0 scrub_Toxins = 0
}, },
/obj/machinery/portable_atmospherics/canister/freon,
/turf/open/floor/plasteel/floorgrime, /turf/open/floor/plasteel/floorgrime,
/area/toxins/storage) /area/toxins/storage)
"bCY" = ( "bCY" = (
@@ -37041,7 +37040,6 @@
icon_state = "4-8"; icon_state = "4-8";
pixel_y = 0 pixel_y = 0
}, },
/obj/machinery/portable_atmospherics/canister/freon,
/mob/living/simple_animal/mouse, /mob/living/simple_animal/mouse,
/turf/open/floor/plasteel/floorgrime, /turf/open/floor/plasteel/floorgrime,
/area/toxins/storage) /area/toxins/storage)
@@ -37091,7 +37089,6 @@
icon_state = "4-8"; icon_state = "4-8";
pixel_y = 0 pixel_y = 0
}, },
/obj/machinery/portable_atmospherics/canister/freon,
/turf/open/floor/plasteel/floorgrime, /turf/open/floor/plasteel/floorgrime,
/area/toxins/storage) /area/toxins/storage)
"bEd" = ( "bEd" = (
@@ -41829,7 +41826,6 @@
/obj/structure/disposalpipe/segment{ /obj/structure/disposalpipe/segment{
dir = 4 dir = 4
}, },
/obj/machinery/portable_atmospherics/canister/freon,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/atmos) /area/atmos)
"bNR" = ( "bNR" = (
@@ -41862,7 +41858,6 @@
scrub_N2O = 0; scrub_N2O = 0;
scrub_Toxins = 0 scrub_Toxins = 0
}, },
/obj/machinery/portable_atmospherics/canister/freon,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/atmos) /area/atmos)
"bNT" = ( "bNT" = (
@@ -105297,7 +105292,7 @@ bAG
bCa bCa
bDc bDc
bEo bEo
apI bIC
bEc bEc
bIB bIB
bIB bIB
@@ -106070,7 +106065,7 @@ bDc
bEo bEo
bDf bDf
bEb bEb
apI bGY
bGY bGY
bJN bJN
bMp bMp