diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 7de3b2eb45..9b14e19b41 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -345,9 +345,7 @@ eg:
var/mob/living/carbon/human/H = YOU_THE_READER
H.gib()
```
-However, DM also has a dot variable, accessed just as ```.``` on its own, defaulting to a value of null. Now, what's special about the dot operator is that it is automatically returned (as in the ```return``` statement) at the end of a proc, provided the proc does not already manually return (```return count``` for example.) Why is this special?
-
-Well, the ```return``` statement should ideally be free from overhead (functionally free, although of course nothing's free), but DM fails to fulfill this. DM's return statement is actually fairly costly for what it does and for what it's used for.
+However, DM also has a dot variable, accessed just as ```.``` on its own, defaulting to a value of null. Now, what's special about the dot operator is that it is automatically returned (as in the ```return``` statement) at the end of a proc, provided the proc does not already manually return (```return count``` for example.) Why is this special?
With ```.``` being everpresent in every proc, can we use it as a temporary variable? Of course we can! However, the ```.``` operator cannot replace a typecasted variable - it can hold data any other var in DM can, it just can't be accessed as one, although the ```.``` operator is compatible with a few operators that look weird but work perfectly fine, such as: ```.++``` for incrementing ```.'s``` value, or ```.[1]``` for accessing the first element of ```.```, provided that it's a list.
diff --git a/README.md b/README.md
index aaf2ad2a27..1bdc45fa63 100644
--- a/README.md
+++ b/README.md
@@ -34,6 +34,8 @@ code tab of https://github.com/tgstation/tgstation
(note: this will use a lot of bandwidth if you wish to update and is a lot of
hassle if you want to make any changes at all, so it's not recommended.)
+Option 3: Download a pre-compiled nightly at https://tgstation13.download/nightlies/ (same caveats as option 2)
+
## INSTALLATION
First-time installation should be fairly straightforward. First, you'll need
@@ -128,6 +130,15 @@ To enable an away mission open `config/awaymissionconfig.txt` and uncomment one
The SQL backend requires a Mariadb server running 10.2 or later. Mysql is not supported but Mariadb is a drop in replacement for mysql. SQL is required for the library, stats tracking, admin notes, and job-only bans, among other features, mostly related to server administration. Your server details go in /config/dbconfig.txt, and the SQL schema is in /SQL/tgstation_schema.sql and /SQL/tgstation_schema_prefix.sql depending on if you want table prefixes. More detailed setup instructions are located here: https://www.tgstation13.org/wiki/Downloading_the_source_code#Setting_up_the_database
+## WEB/CDN RESOURCE DELIVERY
+
+Web delivery of game resources makes it quicker for players to join and reduces some of the stress on the game server.
+
+1. Edit compile_options.dm to set the `PRELOAD_RSC` define to `0`
+1. Add a url to config/external_rsc_urls pointing to a .zip file containing the .rsc.
+ * If you keep up to date with /tg/ you could reuse /tg/'s rsc cdn at http://tgstation13.download/byond/tgstation.zip. Otherwise you can use cdn services like CDN77 or cloudflare (requires adding a page rule to enable caching of the zip), or roll your own cdn using route 53 and vps providers.
+ * Regardless even offloading the rsc to a website without a CDN will be a massive improvement over the in game system for transferring files.
+
## IRC BOT SETUP
Included in the repository is a python3 compatible IRC bot capable of relaying adminhelps to a specified
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm
index d77a0f7ec0..02f3446902 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm
@@ -120,9 +120,6 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered)
"t" = (
-/turf/open/floor/plasteel/cult{
- initial_gas_mix = "o2=14;n2=23;TEMP=300"
- },
/obj/effect/baseturf_helper/lava_land/surface,
/turf/closed/wall/mineral/cult,
/area/ruin/unpowered)
@@ -169,7 +166,7 @@ s
d
c
c
-n
+g
c
c
d
@@ -234,7 +231,7 @@ b
b
c
c
-h
+g
i
b
b
@@ -252,14 +249,14 @@ b
g
b
b
-j
+d
b
o
b
-j
+d
b
b
-r
+g
b
c
"}
@@ -285,10 +282,10 @@ a
c
c
c
-h
+g
b
m
-j
+d
q
b
b
@@ -339,7 +336,7 @@ s
d
c
c
-p
+g
c
c
d
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
index 8d52fc9180..587e234886 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
@@ -1,4 +1,4 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/closed/mineral/volcanic/lava_land_surface,
/area/lavaland/surface/outdoors)
@@ -145,9 +145,6 @@
/turf/open/floor/pod/dark,
/area/ruin/powered)
"E" = (
-/turf/open/floor/plating{
- initial_gas_mix = "o2=14;n2=23;TEMP=300"
- },
/obj/structure/shuttle/engine/propulsion/burst{
dir = 8
},
diff --git a/_maps/RandomRuins/SpaceRuins/asteroid4.dmm b/_maps/RandomRuins/SpaceRuins/asteroid4.dmm
index c6234672bf..da6047ce22 100644
--- a/_maps/RandomRuins/SpaceRuins/asteroid4.dmm
+++ b/_maps/RandomRuins/SpaceRuins/asteroid4.dmm
@@ -30,7 +30,6 @@
/turf/closed/wall/mineral/titanium,
/area/ruin/unpowered)
"k" = (
-/turf/open/floor/plating,
/obj/item/stack/sheet/mineral/bananium{
amount = 15
},
diff --git a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
index 6811cc6be2..2f3a1eb42c 100644
--- a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
+++ b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
@@ -355,7 +355,6 @@
/turf/closed/wall/mineral/titanium,
/area/ruin/unpowered)
"bm" = (
-/turf/open/floor/plating,
/obj/machinery/door/poddoor{
id = "caravantrade1";
name = "cargo blastdoor"
@@ -399,17 +398,6 @@
/obj/structure/lattice,
/turf/template_noop,
/area/template_noop)
-"bt" = (
-/turf/open/floor/plating/airless{
- icon_plating = "platingdmg3";
- icon_state = "platingdmg3"
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless{
- icon_plating = "platingdmg2";
- icon_state = "platingdmg2"
- },
-/area/ruin/unpowered)
"bu" = (
/obj/item/stack/sheet/metal,
/obj/effect/decal/cleanable/dirt,
@@ -493,7 +481,6 @@
/turf/open/floor/mineral/titanium/blue/airless,
/area/ruin/unpowered)
"bJ" = (
-/turf/open/floor/plating,
/obj/effect/spawner/structure/window/shuttle,
/turf/open/floor/plating/airless{
icon_plating = "platingdmg2";
@@ -649,7 +636,6 @@
/turf/template_noop,
/area/template_noop)
"ch" = (
-/turf/template_noop,
/obj/item/stack/rods,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating/airless{
@@ -754,7 +740,6 @@
},
/area/ruin/unpowered)
"cx" = (
-/turf/template_noop,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating/airless{
icon_plating = "platingdmg2";
@@ -1159,12 +1144,6 @@
},
/turf/open/floor/plasteel,
/area/ruin/powered)
-"dB" = (
-/obj/machinery/computer{
- dir = 8
- },
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/powered)
"dC" = (
/obj/machinery/computer{
dir = 8
@@ -1862,7 +1841,7 @@ aa
aa
ab
ce
-dB
+dC
ce
ab
aa
@@ -3497,7 +3476,7 @@ aa
aa
aa
bl
-bt
+ci
bB
bB
bU
diff --git a/_maps/RandomRuins/SpaceRuins/crashedship.dmm b/_maps/RandomRuins/SpaceRuins/crashedship.dmm
index 2f4586c11b..177f1c3cbc 100644
--- a/_maps/RandomRuins/SpaceRuins/crashedship.dmm
+++ b/_maps/RandomRuins/SpaceRuins/crashedship.dmm
@@ -10,18 +10,9 @@
"ac" = (
/turf/closed/wall/mineral/titanium,
/area/awaymission/BMPship/Aft)
-"ad" = (
-/turf/closed/wall/mineral/titanium/interior,
-/area/awaymission/BMPship/Aft)
"ae" = (
/turf/closed/wall/mineral/titanium/overspace,
/area/awaymission/BMPship/Aft)
-"af" = (
-/obj/effect/spawner/structure/window/hollow/reinforced/end{
- dir = 1
- },
-/turf/open/floor/engine,
-/area/awaymission/BMPship/Aft)
"ag" = (
/obj/machinery/porta_turret{
dir = 8;
@@ -181,22 +172,9 @@
},
/turf/open/floor/plating,
/area/awaymission/BMPship/Aft)
-"aH" = (
-/turf/closed/wall/mineral/titanium/interior,
-/area/awaymission/BMPship/Fore)
"aI" = (
/turf/closed/wall/mineral/titanium/overspace,
/area/awaymission/BMPship/Fore)
-"aJ" = (
-/turf/open/floor/plating/airless{
- icon_state = "platingdmg2"
- },
-/area/awaymission/BMPship/Midship)
-"aK" = (
-/turf/open/floor/plating/airless{
- icon_state = "platingdmg3"
- },
-/area/awaymission/BMPship/Midship)
"aL" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -224,12 +202,6 @@
},
/turf/open/floor/plating,
/area/awaymission/BMPship/Aft)
-"aQ" = (
-/obj/effect/spawner/structure/window/hollow/reinforced/end{
- dir = 1
- },
-/turf/open/floor/plating/airless,
-/area/awaymission/BMPship/Fore)
"aR" = (
/obj/structure/table/wood,
/obj/item/stack/spacecash/c500,
@@ -274,16 +246,6 @@
/obj/structure/sign/vacuum,
/turf/closed/wall/mineral/titanium,
/area/awaymission/BMPship/Fore)
-"aZ" = (
-/turf/open/floor/plating/airless{
- icon_state = "platingdmg1"
- },
-/area/awaymission/BMPship/Midship)
-"ba" = (
-/turf/open/floor/plating/airless{
- icon_state = "panelscorched"
- },
-/area/awaymission/BMPship/Midship)
"bb" = (
/obj/effect/decal/cleanable/blood/gibs/old,
/obj/effect/gibspawner/human,
@@ -296,12 +258,6 @@
/obj/item/clothing/glasses/regular/hipster,
/turf/open/floor/plating/airless,
/area/awaymission/BMPship/Midship)
-"bd" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plating/airless,
-/area/awaymission/BMPship/Midship)
"be" = (
/obj/machinery/door/unpowered/shuttle,
/obj/structure/cable{
@@ -370,12 +326,6 @@
/obj/machinery/door/airlock/external,
/turf/open/floor/plating,
/area/awaymission/BMPship/Fore)
-"br" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plating,
-/area/awaymission/BMPship/Aft)
"bs" = (
/obj/structure/closet/crate,
/obj/item/stack/spacecash/c1000,
@@ -455,12 +405,6 @@
/obj/item/hand_labeler,
/turf/open/floor/plating,
/area/awaymission/BMPship/Aft)
-"bF" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plating,
-/area/awaymission/BMPship/Aft)
"bG" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -474,10 +418,6 @@
},
/turf/open/floor/plating,
/area/awaymission/BMPship/Aft)
-"bI" = (
-/obj/machinery/door/unpowered/shuttle,
-/turf/open/floor/carpet,
-/area/awaymission/BMPship/Fore)
"bJ" = (
/obj/machinery/door/airlock/silver,
/turf/open/floor/carpet,
@@ -697,12 +637,6 @@
},
/turf/open/floor/plating,
/area/awaymission/BMPship/Aft)
-"co" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/carpet,
-/area/awaymission/BMPship/Fore)
"cp" = (
/obj/item/reagent_containers/food/snacks/hugemushroomslice,
/turf/open/floor/plasteel/bar,
@@ -758,18 +692,9 @@
"cC" = (
/turf/open/floor/plasteel/hydrofloor,
/area/awaymission/BMPship/Aft)
-"cD" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel,
-/area/awaymission/BMPship/Aft)
"cE" = (
/turf/open/floor/plasteel,
/area/awaymission/BMPship/Aft)
-"cF" = (
-/turf/closed/wall/mineral/titanium/overspace,
-/area/template_noop)
"cG" = (
/turf/closed/wall/mineral/titanium/interior,
/area/awaymission/BMPship/Fore)
@@ -922,12 +847,6 @@
},
/turf/open/floor/plasteel/bar,
/area/awaymission/BMPship/Midship)
-"dh" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/bar,
-/area/awaymission/BMPship/Midship)
"di" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -1079,15 +998,6 @@
},
/turf/open/floor/plasteel,
/area/awaymission/BMPship/Aft)
-"dF" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/awaymission/BMPship/Aft)
"dG" = (
/obj/effect/spawner/structure/window/hollow/reinforced/end{
dir = 1
@@ -1509,12 +1419,6 @@
},
/turf/open/floor/plasteel/bar,
/area/awaymission/BMPship/Midship)
-"eN" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/BMPship/Aft)
"eO" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -2041,12 +1945,6 @@
},
/turf/open/floor/plasteel,
/area/awaymission/BMPship/Aft)
-"gB" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel,
-/area/awaymission/BMPship/Aft)
"gC" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -2250,12 +2148,6 @@
dir = 2
},
/area/awaymission/BMPship/Aft)
-"hm" = (
-/turf/open/floor/plasteel/cafeteria{
- dir = 2
- },
-/turf/closed/wall/mineral/titanium/interior,
-/area/awaymission/BMPship/Aft)
"hn" = (
/obj/item/clothing/gloves/color/fyellow,
/turf/open/floor/plating/asteroid/airless,
@@ -2305,24 +2197,6 @@
},
/turf/open/floor/carpet,
/area/awaymission/BMPship/Fore)
-"hy" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/awaymission/BMPship/Fore)
-"hz" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/awaymission/BMPship/Fore)
-"hA" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/awaymission/BMPship/Fore)
-"hB" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/awaymission/BMPship/Fore)
-"hC" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/awaymission/BMPship/Fore)
-"hD" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/awaymission/BMPship/Fore)
"hE" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/awaymission/BMPship/Fore)
@@ -2702,7 +2576,7 @@ aa
aa
aa
aI
-hD
+hE
bV
hx
ee
@@ -2752,7 +2626,7 @@ aa
aa
aa
aI
-hC
+hE
bV
bV
dH
@@ -2802,7 +2676,7 @@ aa
aa
aa
aI
-hB
+hE
bV
bV
bV
@@ -2847,12 +2721,12 @@ aa
aa
aa
aa
-aH
-aQ
+cG
+gk
bl
bt
-hy
-hA
+hE
+hE
bV
bV
cY
@@ -2862,15 +2736,15 @@ eg
bV
bV
bV
-bI
+fc
fv
fJ
-aH
+cG
hE
-aQ
+gk
gF
gR
-aH
+cG
fS
fS
gb
@@ -2898,7 +2772,7 @@ aa
aa
aa
aa
-aH
+cG
aR
bm
bu
@@ -2911,17 +2785,17 @@ du
bV
bV
ev
-co
-co
+db
+db
fd
fw
fu
fT
-aH
+cG
gl
gG
gl
-aH
+cG
gb
gb
gb
@@ -2949,11 +2823,11 @@ aa
aa
aa
aa
-aH
+cG
aS
bn
bm
-bI
+fc
bV
bV
bV
@@ -2968,11 +2842,11 @@ aT
fx
fK
fU
-aH
+cG
gm
gG
gG
-aH
+cG
gb
gb
gb
@@ -3000,13 +2874,13 @@ aa
aa
aa
aa
-aH
+cG
aT
aT
aT
-hz
+hE
bW
-co
+db
cH
bV
bV
@@ -3019,11 +2893,11 @@ aT
fy
fL
fv
-aH
-aH
+cG
+cG
gH
-aH
-aH
+cG
+cG
gb
gb
gb
@@ -3051,7 +2925,7 @@ aa
aa
aa
aa
-aH
+cG
aU
bo
bp
@@ -3059,10 +2933,10 @@ bJ
bV
bV
cI
-co
+db
dv
dI
-co
+db
ex
bV
eU
@@ -3074,7 +2948,7 @@ gd
gn
gI
fv
-aH
+cG
gb
gb
gb
@@ -3102,7 +2976,7 @@ aa
aa
aa
aa
-aH
+cG
aV
bp
bv
@@ -3125,7 +2999,7 @@ aT
go
fI
fv
-aH
+cG
gb
gb
gb
@@ -3153,7 +3027,7 @@ aa
aa
aa
aa
-aH
+cG
aW
bp
bv
@@ -3163,7 +3037,7 @@ ce
ce
ce
dw
-dh
+dy
ce
ce
ce
@@ -3204,7 +3078,7 @@ aa
aa
aa
aa
-aH
+cG
aV
bp
bw
@@ -3255,7 +3129,7 @@ aa
aa
aa
aa
-aH
+cG
aW
bp
bv
@@ -3264,7 +3138,7 @@ bZ
bZ
bZ
dc
-dh
+dy
dB
dB
dB
@@ -3306,7 +3180,7 @@ aa
aa
aa
aa
-aH
+cG
aV
bp
bv
@@ -3315,7 +3189,7 @@ ca
cq
cq
dd
-dh
+dy
dB
eh
eh
@@ -3357,7 +3231,7 @@ aa
aa
aa
aa
-aH
+cG
aX
bp
bx
@@ -3366,7 +3240,7 @@ cb
cq
cJ
dd
-dh
+dy
dB
eh
ey
@@ -3417,7 +3291,7 @@ cc
cq
cq
de
-dh
+dy
dB
eh
ej
@@ -3468,7 +3342,7 @@ ca
cr
cq
dd
-dh
+dy
dB
ei
ei
@@ -3519,7 +3393,7 @@ cd
cd
cd
df
-dh
+dy
dL
ej
ej
@@ -3624,7 +3498,7 @@ ce
ce
ce
ek
-dh
+dy
ce
ce
fg
@@ -3717,7 +3591,7 @@ am
aa
am
aq
-aZ
+gt
aq
cf
cs
@@ -3726,7 +3600,7 @@ ce
ce
ce
ce
-dh
+dy
ce
ce
ce
@@ -3766,9 +3640,9 @@ am
aa
aa
am
-aZ
+gt
at
-ba
+ha
aq
cg
cs
@@ -3816,15 +3690,15 @@ aa
aa
am
am
-aJ
-aK
-ba
+gL
+hg
+ha
at
aq
ch
cs
cN
-dh
+dy
ce
dO
ce
@@ -3833,7 +3707,7 @@ ce
ce
dO
ce
-dh
+dy
ce
fm
at
@@ -3867,15 +3741,15 @@ aa
aa
ap
aq
-aK
+hg
at
-aK
+hg
by
aq
ci
ct
cO
-dh
+dy
dA
dP
el
@@ -3884,7 +3758,7 @@ ce
dA
fi
fB
-dh
+dy
ce
fm
gt
@@ -3919,14 +3793,14 @@ aa
aq
as
at
-ba
+ha
at
bz
aq
ce
ce
ce
-dh
+dy
dB
dQ
dB
@@ -3935,7 +3809,7 @@ eL
dB
fj
dB
-dh
+dy
ce
fm
gs
@@ -3971,13 +3845,13 @@ aq
at
at
bb
-ba
+ha
at
bK
ce
ce
ce
-dh
+dy
dB
dP
dB
@@ -3986,7 +3860,7 @@ ce
dB
fk
dB
-dh
+dy
fV
fm
gu
@@ -4028,7 +3902,7 @@ bK
ce
ce
ce
-dh
+dy
dB
dP
dB
@@ -4037,7 +3911,7 @@ ce
dB
fk
dB
-dh
+dy
ce
fm
at
@@ -4079,7 +3953,7 @@ bK
ce
ce
ce
-dh
+dy
dB
dP
dB
@@ -4088,7 +3962,7 @@ ce
dB
fk
dB
-dh
+dy
ce
fm
gs
@@ -4130,7 +4004,7 @@ aq
cj
cu
ce
-dh
+dy
dB
dP
dB
@@ -4139,7 +4013,7 @@ ce
dB
fk
dB
-dh
+dy
ce
fm
gt
@@ -4181,7 +4055,7 @@ aq
ck
cu
ce
-dh
+dy
dB
dR
dB
@@ -4190,7 +4064,7 @@ ce
dB
dR
dB
-dh
+dy
ce
fm
gv
@@ -4232,7 +4106,7 @@ aq
cl
ce
cP
-dh
+dy
dB
dS
dB
@@ -4241,7 +4115,7 @@ ce
dB
dS
dB
-dh
+dy
fV
fm
gw
@@ -4276,7 +4150,7 @@ aa
aq
az
at
-bd
+gV
at
bA
aq
@@ -4327,7 +4201,7 @@ aa
aq
aA
at
-bd
+gV
at
bB
aq
@@ -4339,7 +4213,7 @@ ce
dU
em
ce
-dh
+dy
eW
fl
ce
@@ -4348,7 +4222,7 @@ ce
fm
gy
at
-bd
+gV
at
hi
fm
@@ -4390,7 +4264,7 @@ aq
aq
en
ce
-dh
+dy
eX
fm
fm
@@ -4423,7 +4297,7 @@ aa
aa
aa
ac
-af
+ho
aj
an
ac
@@ -4441,7 +4315,7 @@ cw
cw
eo
cw
-eN
+fD
eo
cw
cw
@@ -4450,11 +4324,11 @@ ac
cE
gz
gg
-gB
+gX
cE
hj
-ad
-af
+ht
+ho
aj
hu
dk
@@ -4473,7 +4347,7 @@ aa
aa
aa
aa
-ad
+ht
ag
ah
ag
@@ -4481,7 +4355,7 @@ ac
aC
al
bg
-br
+fR
bD
bM
ac
@@ -4501,10 +4375,10 @@ ac
cE
cE
cE
-gB
+gX
cE
hk
-ad
+ht
ag
ah
ag
@@ -4524,7 +4398,7 @@ aa
aa
aa
aa
-ad
+ht
ah
ah
ao
@@ -4546,16 +4420,16 @@ eD
eD
eq
fn
-eN
+fD
cw
fY
cE
al
cE
-gB
+gX
hb
cE
-ad
+ht
hp
ah
ah
@@ -4575,7 +4449,7 @@ aa
aa
aa
aa
-ad
+ht
ac
ak
ac
@@ -4584,7 +4458,7 @@ aE
aN
bh
al
-bF
+dm
bO
ac
cx
@@ -4597,16 +4471,16 @@ al
er
eY
fo
-eN
+fD
cw
ac
cE
cE
gN
-gB
+gX
hc
al
-ad
+ht
ac
ak
ac
@@ -4626,7 +4500,7 @@ aa
aa
aa
aa
-ad
+ht
ai
al
al
@@ -4635,7 +4509,7 @@ aF
al
al
al
-bF
+dm
bM
ac
cy
@@ -4648,16 +4522,16 @@ eE
al
al
fo
-eN
+fD
cw
ac
gf
cE
cE
-gB
+gX
cE
cE
-ad
+ht
hq
al
ai
@@ -4678,7 +4552,7 @@ aa
aa
aa
ae
-ad
+ht
al
al
ar
@@ -4702,7 +4576,7 @@ fp
fE
dj
fZ
-cD
+dE
gA
gO
gY
@@ -4711,7 +4585,7 @@ cE
fY
al
hs
-ad
+ht
ae
aa
aa
@@ -4730,14 +4604,14 @@ aa
aa
aa
ae
-ad
+ht
al
ac
aG
al
bi
al
-bF
+dm
bP
ac
cA
@@ -4754,14 +4628,14 @@ cw
fP
ac
gg
-gB
+gX
cE
cE
cE
cE
-ad
+ht
hr
-ad
+ht
ae
aa
aa
@@ -4782,13 +4656,13 @@ aa
aa
aa
ae
-ad
-ad
+ht
+ht
aG
al
bj
al
-bF
+dm
bQ
ac
cB
@@ -4805,12 +4679,12 @@ fF
fQ
ac
gh
-gB
+gX
gN
cE
gN
cE
-ad
+ht
ac
ae
aa
@@ -4834,34 +4708,34 @@ aa
aa
aa
ae
-ad
+ht
aG
al
bk
al
-bF
+dm
bR
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
+ht
+ht
+ht
+ht
+ht
+ht
+ht
+ht
+ht
+ht
+ht
+ht
+ht
+ht
gi
-gB
+gX
cE
cE
cE
cE
-ad
+ht
ae
aa
aa
@@ -4885,12 +4759,12 @@ aa
aa
aa
aa
-ad
+ht
aG
al
al
al
-bF
+dm
bS
ac
cC
@@ -4907,12 +4781,12 @@ cV
cV
ac
gf
-gB
+gX
cE
-ad
+ht
hd
-ad
-ad
+ht
+ht
aa
aa
aa
@@ -4936,7 +4810,7 @@ aa
aa
aa
aa
-ad
+ht
aG
aO
al
@@ -4944,26 +4818,26 @@ al
bg
bT
cn
-cD
-cD
+dE
+dE
dl
-cD
+dE
dZ
dZ
-cD
-cD
+dE
+dE
fa
dZ
-cD
-br
+dE
+fR
ga
-cD
+dE
gC
cE
-ad
+ht
he
hl
-ad
+ht
aa
aa
aa
@@ -4988,16 +4862,16 @@ aa
aa
aa
ae
-ad
+ht
aP
aP
bs
bH
bU
-ad
+ht
cE
cC
-bF
+dm
al
al
al
@@ -5011,9 +4885,9 @@ ac
gj
gD
gP
-ad
+ht
hf
-hm
+ht
ae
aa
aa
@@ -5040,30 +4914,30 @@ aa
aa
aa
ae
-ad
-ad
-ad
-ad
-ad
-ad
-ad
+ht
+ht
+ht
+ht
+ht
+ht
+ht
cC
dn
-br
+fR
ea
-br
-br
+fR
+fR
eQ
al
fq
cC
-ad
-ad
-ad
-ad
-ad
-ad
-ad
+ht
+ht
+ht
+ht
+ht
+ht
+ht
ae
aa
aa
@@ -5108,7 +4982,7 @@ eb
al
al
fG
-ad
+ht
ae
aa
aa
@@ -5151,15 +5025,15 @@ aa
ac
cX
dp
-dF
+eu
ec
-dF
-dF
+eu
+eu
eR
cX
fr
fH
-ad
+ht
aa
aa
aa
@@ -5200,17 +5074,17 @@ aa
aa
aa
ac
-ad
-ad
+ht
+ht
ak
-ad
-ad
+ht
+ht
ac
-ad
+ht
fb
-ad
-ad
-ad
+ht
+ht
+ht
aa
aa
aa
@@ -5251,16 +5125,16 @@ aa
aa
aa
ae
-ad
+ht
dq
ah
ah
-ad
-ad
+ht
+ht
eS
ah
fs
-ad
+ht
ae
aa
aa
@@ -5302,16 +5176,16 @@ aa
aa
aa
aa
-ad
+ht
dr
dr
dr
-ad
-ad
+ht
+ht
dr
dr
dr
-ad
+ht
aa
aa
aa
diff --git a/_maps/RandomRuins/SpaceRuins/derelict6.dmm b/_maps/RandomRuins/SpaceRuins/derelict6.dmm
index 6b714814af..c1ba9f561c 100644
--- a/_maps/RandomRuins/SpaceRuins/derelict6.dmm
+++ b/_maps/RandomRuins/SpaceRuins/derelict6.dmm
@@ -11,16 +11,8 @@
icon_plating = "platingdmg3";
icon_state = "platingdmg3"
},
-/turf/open/floor/plating/airless{
- icon_plating = "platingdmg2";
- icon_state = "platingdmg2"
- },
/area/ruin/unpowered)
"ad" = (
-/turf/open/floor/plating/airless{
- icon_plating = "platingdmg3";
- icon_state = "platingdmg3"
- },
/obj/structure/girder,
/turf/open/floor/plating/airless{
icon_plating = "platingdmg2";
@@ -33,10 +25,6 @@
/turf/template_noop,
/area/template_noop)
"af" = (
-/turf/open/floor/plating/airless{
- icon_plating = "platingdmg3";
- icon_state = "platingdmg3"
- },
/obj/item/stack/sheet/metal,
/turf/open/floor/plating/airless{
icon_plating = "platingdmg2";
@@ -63,10 +51,6 @@
/turf/template_noop,
/area/template_noop)
"ak" = (
-/turf/open/floor/plating/airless{
- icon_plating = "platingdmg3";
- icon_state = "platingdmg3"
- },
/obj/item/stack/rods,
/turf/open/floor/plating/airless{
icon_plating = "platingdmg2";
@@ -116,7 +100,6 @@
/turf/open/floor/plating/airless,
/area/ruin/unpowered)
"as" = (
-/turf/open/floor/plating/airless,
/obj/item/stack/sheet/metal,
/turf/open/floor/plating/airless{
icon_plating = "platingdmg2";
@@ -147,7 +130,6 @@
/turf/open/floor/plasteel/airless,
/area/ruin/unpowered)
"ay" = (
-/turf/open/floor/plating/airless,
/obj/item/stack/tile/plasteel,
/turf/open/floor/plating/airless{
icon_plating = "platingdmg2";
@@ -328,9 +310,6 @@
/turf/open/floor/plasteel/airless/bar,
/area/ruin/unpowered)
"be" = (
-/turf/open/floor/plasteel/bar{
- initial_gas_mix = "TEMP=2.7"
- },
/turf/open/floor/plating/airless{
icon_plating = "platingdmg2";
icon_state = "platingdmg2"
diff --git a/_maps/RandomRuins/SpaceRuins/vaporwave.dmm b/_maps/RandomRuins/SpaceRuins/vaporwave.dmm
index 3a4010784a..896a34e5db 100644
--- a/_maps/RandomRuins/SpaceRuins/vaporwave.dmm
+++ b/_maps/RandomRuins/SpaceRuins/vaporwave.dmm
@@ -162,7 +162,6 @@
/turf/open/floor/plating/asteroid/airless,
/area/ruin/unpowered/no_grav)
"I" = (
-/turf/open/space,
/obj/effect/turf_decal/sand,
/turf/open/floor/plasteel/airless/asteroid,
/area/ruin/unpowered/no_grav)
diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm
index 06ef5c5c79..b1e840ac15 100644
--- a/_maps/RandomZLevels/caves.dmm
+++ b/_maps/RandomZLevels/caves.dmm
@@ -137,9 +137,6 @@
},
/area/awaymission/caves/BMP_asteroid/level_four)
"ax" = (
-/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14"
- },
/turf/closed/wall/mineral/cult,
/area/awaymission/caves/BMP_asteroid/level_four)
"ay" = (
@@ -377,9 +374,6 @@
},
/area/awaymission/caves/BMP_asteroid/level_three)
"bd" = (
-/turf/open/floor/plating/asteroid/basalt/lava{
- initial_gas_mix = "n2=23;o2=14"
- },
/turf/closed/wall/mineral/cult,
/area/awaymission/caves/BMP_asteroid/level_four)
"be" = (
diff --git a/_maps/RandomZLevels/centcomAway.dmm b/_maps/RandomZLevels/centcomAway.dmm
index 1a58d927e3..94f830e139 100644
--- a/_maps/RandomZLevels/centcomAway.dmm
+++ b/_maps/RandomZLevels/centcomAway.dmm
@@ -350,9 +350,6 @@
},
/area/awaymission/centcomAway/hangar)
"bn" = (
-/turf/open/floor/plasteel/vault{
- dir = 5
- },
/turf/closed/wall/mineral/titanium/interior,
/area/awaymission/centcomAway/hangar)
"bo" = (
@@ -1884,7 +1881,6 @@
/turf/open/floor/plasteel/dark,
/area/awaymission/centcomAway/hangar)
"gS" = (
-/turf/open/floor/plating,
/obj/structure/shuttle/engine/propulsion/burst{
dir = 8
},
diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm
index f4737a3d7c..528f5f7321 100644
--- a/_maps/RandomZLevels/moonoutpost19.dmm
+++ b/_maps/RandomZLevels/moonoutpost19.dmm
@@ -5685,10 +5685,6 @@
},
/area/awaymission/moonoutpost19/arrivals)
"lc" = (
-/turf/open/floor/plating/asteroid{
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
- heat_capacity = 1e+006
- },
/turf/closed/wall/mineral/titanium/interior,
/area/awaymission/moonoutpost19/arrivals)
"ld" = (
diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm
index b98b064142..6c9a86a7cc 100644
--- a/_maps/RandomZLevels/research.dmm
+++ b/_maps/RandomZLevels/research.dmm
@@ -20,8 +20,7 @@
/area/awaymission/research/exterior)
"ag" = (
/turf/closed/wall/mineral/plastitanium{
- dir = 8;
- icon_state = "diagonalWall3"
+ dir = 8
},
/area/awaymission/research/interior/engineering)
"ah" = (
@@ -42,8 +41,7 @@
/area/awaymission/research/interior/engineering)
"ak" = (
/turf/closed/wall/mineral/plastitanium{
- dir = 1;
- icon_state = "diagonalWall3"
+ dir = 1
},
/area/awaymission/research/interior/engineering)
"al" = (
@@ -231,9 +229,7 @@
/turf/open/floor/plasteel{
icon_state = "damaged4"
},
-/turf/closed/wall/mineral/plastitanium{
- icon_state = "diagonalWall3"
- },
+/turf/closed/wall/mineral/plastitanium,
/area/awaymission/research/interior/engineering)
"aT" = (
/mob/living/simple_animal/hostile/syndicate/melee,
@@ -244,8 +240,7 @@
icon_state = "damaged1"
},
/turf/closed/wall/mineral/plastitanium{
- dir = 4;
- icon_state = "diagonalWall3"
+ dir = 4
},
/area/awaymission/research/interior/engineering)
"aV" = (
@@ -303,9 +298,7 @@
/turf/open/floor/plasteel{
icon_state = "damaged5"
},
-/turf/closed/wall/mineral/plastitanium{
- icon_state = "diagonalWall3"
- },
+/turf/closed/wall/mineral/plastitanium,
/area/awaymission/research/interior/engineering)
"bd" = (
/turf/open/floor/plasteel{
@@ -320,12 +313,8 @@
},
/area/awaymission/research/interior/engineering)
"bf" = (
-/turf/open/floor/plasteel{
- icon_state = "damaged3"
- },
/turf/closed/wall/mineral/plastitanium{
- dir = 4;
- icon_state = "diagonalWall3"
+ dir = 4
},
/area/awaymission/research/interior/engineering)
"bg" = (
@@ -4041,7 +4030,6 @@
/turf/closed/wall/mineral/titanium,
/area/awaymission/research/exterior)
"mf" = (
-/turf/open/floor/plating/asteroid/airless,
/obj/structure/shuttle/engine/propulsion/burst{
dir = 4
},
@@ -4152,7 +4140,6 @@
/turf/closed/wall/mineral/titanium/interior,
/area/awaymission/research/exterior)
"mz" = (
-/turf/open/floor/plating/asteroid/airless,
/obj/structure/shuttle/engine/propulsion/burst{
dir = 8
},
@@ -4357,6 +4344,12 @@
"ne" = (
/turf/open/floor/mineral/plasma,
/area/space/nearstation)
+"nf" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/awaymission/research/interior/engineering)
+"ng" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/awaymission/research/interior/engineering)
(1,1,1) = {"
aa
@@ -41728,7 +41721,7 @@ ap
ap
an
aJ
-al
+nf
bc
bp
bH
@@ -42499,7 +42492,7 @@ aq
ay
an
aL
-al
+ng
bf
bs
bK
diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm
index 84c91c3dd7..2df265cda6 100644
--- a/_maps/RandomZLevels/snowdin.dmm
+++ b/_maps/RandomZLevels/snowdin.dmm
@@ -1464,7 +1464,6 @@
/turf/open/floor/plating/ice/colder,
/area/awaymission/snowdin/dungeon1)
"eK" = (
-/turf/open/space,
/obj/structure/girder,
/turf/open/floor/plating/snowed,
/area/awaymission/snowdin/post)
diff --git a/_maps/RandomZLevels/spacebattle.dmm b/_maps/RandomZLevels/spacebattle.dmm
index 9f3b0c8fc1..d1b199e8a3 100644
--- a/_maps/RandomZLevels/spacebattle.dmm
+++ b/_maps/RandomZLevels/spacebattle.dmm
@@ -5,12 +5,6 @@
"ab" = (
/turf/open/space,
/area/space)
-"ac" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 8;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate2)
"ad" = (
/obj/structure/shuttle/engine/propulsion/right{
dir = 1
@@ -29,12 +23,6 @@
},
/turf/open/space,
/area/awaymission/spacebattle/syndicate2)
-"ag" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 1;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate2)
"ah" = (
/turf/closed/wall/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate2)
@@ -98,12 +86,6 @@
/obj/machinery/door/unpowered/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/awaymission/spacebattle/syndicate2)
-"av" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 8;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate3)
"aw" = (
/obj/structure/shuttle/engine/propulsion/right{
dir = 1
@@ -122,12 +104,6 @@
},
/turf/open/space,
/area/awaymission/spacebattle/syndicate3)
-"az" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 1;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate3)
"aA" = (
/obj/structure/table/reinforced,
/obj/item/gun/ballistic/automatic/pistol,
@@ -150,11 +126,6 @@
/obj/machinery/door/airlock/external,
/turf/open/floor/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate3)
-"aF" = (
-/turf/closed/wall/mineral/plastitanium{
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate2)
"aG" = (
/mob/living/simple_animal/hostile/syndicate/melee{
deathmessage = "\[src] falls limp as they release their grip from the energy weapons, activating their self-destruct function!";
@@ -162,12 +133,6 @@
},
/turf/open/floor/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate2)
-"aH" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 4;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate2)
"aI" = (
/obj/structure/table/reinforced,
/obj/item/clothing/suit/space/hardsuit/syndi,
@@ -183,28 +148,10 @@
},
/turf/open/floor/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate2)
-"aL" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 8;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate2)
"aM" = (
/obj/machinery/door/airlock/external,
/turf/open/floor/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate2)
-"aN" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 1;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate2)
-"aO" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 8;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate1)
"aP" = (
/obj/structure/shuttle/engine/propulsion/right{
dir = 1
@@ -223,12 +170,6 @@
},
/turf/open/space,
/area/awaymission/spacebattle/syndicate1)
-"aS" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 1;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate1)
"aT" = (
/obj/machinery/sleeper,
/turf/open/floor/mineral/plastitanium,
@@ -358,21 +299,10 @@
/obj/item/restraints/handcuffs,
/turf/open/floor/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate1)
-"bq" = (
-/turf/closed/wall/mineral/plastitanium{
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate3)
"br" = (
/mob/living/simple_animal/hostile/syndicate,
/turf/open/floor/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate3)
-"bs" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 4;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate3)
"bt" = (
/obj/structure/table/reinforced,
/obj/item/melee/transforming/energy/sword/saber/red,
@@ -384,18 +314,6 @@
},
/turf/open/floor/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate3)
-"bv" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 8;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate3)
-"bw" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 1;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate3)
"bx" = (
/obj/structure/table/reinforced,
/obj/item/clothing/head/helmet/swat,
@@ -409,43 +327,20 @@
},
/turf/open/floor/plating,
/area/awaymission/spacebattle/syndicate3)
-"bz" = (
-/turf/closed/wall/mineral/plastitanium{
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate1)
"bA" = (
/obj/structure/chair,
/turf/open/floor/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate2)
-"bB" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 4;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate1)
"bC" = (
/obj/machinery/computer/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate1)
-"bD" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 8;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate1)
"bE" = (
/obj/machinery/door/airlock/external,
/turf/open/floor/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate1)
-"bF" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 1;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate1)
"bG" = (
/obj/machinery/porta_turret{
dir = 8;
@@ -526,15 +421,6 @@
"bT" = (
/turf/closed/wall/mineral/titanium,
/area/awaymission/spacebattle/cruiser)
-"bU" = (
-/turf/closed/wall/mineral/titanium,
-/area/awaymission/spacebattle/cruiser)
-"bV" = (
-/turf/closed/wall/mineral/titanium,
-/area/awaymission/spacebattle/cruiser)
-"bW" = (
-/turf/closed/wall/mineral/titanium,
-/area/awaymission/spacebattle/cruiser)
"bX" = (
/obj/structure/shuttle/engine/propulsion/burst/left{
dir = 8
@@ -576,9 +462,6 @@
/obj/machinery/door/unpowered/shuttle,
/turf/open/floor/plasteel,
/area/awaymission/spacebattle/cruiser)
-"ce" = (
-/turf/closed/wall/mineral/titanium,
-/area/awaymission/spacebattle/cruiser)
"cf" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8
@@ -589,14 +472,6 @@
/obj/structure/table/reinforced,
/turf/open/floor/plasteel,
/area/awaymission/spacebattle/cruiser)
-"ch" = (
-/turf/open/floor/plasteel{
- icon_state = "damaged5"
- },
-/turf/closed/wall/mineral/plastitanium{
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/cruiser)
"ci" = (
/obj/machinery/door/poddoor/preopen{
id = "spacebattlepod";
@@ -604,27 +479,10 @@
},
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
-"cj" = (
-/turf/open/floor/plasteel{
- icon_state = "damaged4"
- },
-/turf/closed/wall/mineral/plastitanium{
- dir = 4;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/cruiser)
"ck" = (
/mob/living/simple_animal/hostile/syndicate,
/turf/open/floor/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate1)
-"cl" = (
-/turf/open/floor/plasteel{
- icon_state = "damaged2"
- },
-/turf/closed/wall/mineral/plastitanium{
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/cruiser)
"cm" = (
/turf/open/floor/plasteel{
icon_state = "damaged4"
@@ -635,15 +493,6 @@
icon_state = "damaged3"
},
/area/awaymission/spacebattle/cruiser)
-"co" = (
-/turf/open/floor/plasteel{
- icon_state = "damaged5"
- },
-/turf/closed/wall/mineral/plastitanium{
- dir = 4;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/cruiser)
"cp" = (
/turf/open/floor/plasteel{
icon_state = "damaged1"
@@ -661,15 +510,9 @@
/obj/effect/decal/cleanable/blood,
/turf/open/floor/plasteel,
/area/awaymission/spacebattle/cruiser)
-"cs" = (
-/turf/closed/wall/mineral/titanium,
-/area/awaymission/spacebattle/cruiser)
"ct" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/awaymission/spacebattle/cruiser)
-"cu" = (
-/turf/closed/wall/mineral/titanium,
-/area/awaymission/spacebattle/cruiser)
"cv" = (
/obj/machinery/power/smes/magical{
desc = "A high-capacity superconducting magnetic energy storage (SMES) unit.";
@@ -790,9 +633,6 @@
/obj/item/stack/sheet/metal,
/turf/open/floor/plasteel,
/area/awaymission/spacebattle/cruiser)
-"cR" = (
-/turf/closed/wall/mineral/titanium,
-/area/awaymission/spacebattle/cruiser)
"cS" = (
/obj/effect/mob_spawn/human/engineer{
mob_name = "Bill Sanchez";
@@ -916,20 +756,6 @@
/obj/effect/decal/cleanable/blood,
/turf/open/floor/plasteel/bar,
/area/awaymission/spacebattle/cruiser)
-"do" = (
-/turf/closed/wall/mineral/titanium,
-/area/awaymission/spacebattle/cruiser)
-"dp" = (
-/turf/closed/wall/mineral/titanium,
-/area/awaymission/spacebattle/cruiser)
-"dq" = (
-/turf/open/floor/plasteel{
- icon_state = "damaged4"
- },
-/turf/closed/wall/mineral/plastitanium{
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/cruiser)
"dr" = (
/obj/machinery/door/poddoor/preopen{
id = "spacebattlepod2";
@@ -937,28 +763,10 @@
},
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
-"ds" = (
-/turf/open/floor/plasteel{
- icon_state = "damaged1"
- },
-/turf/closed/wall/mineral/plastitanium{
- dir = 4;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/cruiser)
-"dt" = (
-/turf/closed/wall/mineral/titanium,
-/area/awaymission/spacebattle/cruiser)
"du" = (
/obj/effect/decal/cleanable/blood,
/turf/closed/wall/mineral/titanium,
/area/awaymission/spacebattle/cruiser)
-"dv" = (
-/turf/closed/wall/mineral/titanium,
-/area/awaymission/spacebattle/cruiser)
-"dw" = (
-/turf/closed/wall/mineral/titanium,
-/area/awaymission/spacebattle/cruiser)
"dx" = (
/obj/structure/chair,
/turf/open/floor/plasteel/bar,
@@ -1018,15 +826,6 @@
},
/turf/open/floor/engine,
/area/awaymission/spacebattle/cruiser)
-"dI" = (
-/turf/open/floor/plasteel{
- icon_state = "damaged3"
- },
-/turf/closed/wall/mineral/plastitanium{
- dir = 4;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/cruiser)
"dJ" = (
/obj/item/stack/rods,
/turf/open/floor/plasteel,
@@ -1221,21 +1020,9 @@
},
/turf/open/floor/plasteel/bar,
/area/awaymission/spacebattle/cruiser)
-"eq" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 8;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate4)
"er" = (
/turf/closed/wall/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate4)
-"es" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 1;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate4)
"et" = (
/obj/machinery/gateway{
dir = 10
@@ -1279,9 +1066,6 @@
},
/turf/open/floor/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate1)
-"eB" = (
-/turf/closed/wall/mineral/titanium,
-/area/awaymission/spacebattle/cruiser)
"eC" = (
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/blue/side{
@@ -1298,12 +1082,6 @@
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/blue,
/area/awaymission/spacebattle/cruiser)
-"eF" = (
-/obj/effect/spawner/structure/window/hollow/reinforced/end{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/awaymission/spacebattle/cruiser)
"eG" = (
/obj/structure/chair,
/turf/open/floor/mineral/plastitanium,
@@ -1317,12 +1095,6 @@
/obj/effect/decal/cleanable/blood,
/turf/open/floor/plating/airless,
/area/awaymission/spacebattle/cruiser)
-"eI" = (
-/turf/closed/wall/mineral/titanium,
-/area/awaymission/spacebattle/cruiser)
-"eJ" = (
-/turf/closed/wall/mineral/titanium,
-/area/awaymission/spacebattle/cruiser)
"eK" = (
/turf/open/floor/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate4)
@@ -1351,12 +1123,6 @@
},
/turf/open/floor/plasteel/blue,
/area/awaymission/spacebattle/cruiser)
-"eQ" = (
-/obj/effect/spawner/structure/window/hollow/reinforced/middle{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/awaymission/spacebattle/cruiser)
"eR" = (
/obj/machinery/sleeper,
/turf/open/floor/mineral/plastitanium,
@@ -1468,9 +1234,6 @@
/obj/machinery/computer/security/telescreen,
/turf/closed/wall/mineral/titanium,
/area/awaymission/spacebattle/cruiser)
-"fk" = (
-/turf/closed/wall/mineral/titanium,
-/area/awaymission/spacebattle/cruiser)
"fl" = (
/obj/machinery/door/airlock/external,
/turf/open/floor/mineral/plastitanium,
@@ -1889,17 +1652,6 @@
/obj/item/gun/ballistic/shotgun/automatic/combat,
/turf/open/floor/plasteel,
/area/awaymission/spacebattle/cruiser)
-"gA" = (
-/turf/closed/wall/mineral/plastitanium{
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate4)
-"gB" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 4;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate4)
"gC" = (
/obj/structure/closet/crate/secure/weapon,
/obj/item/gun/energy/laser,
@@ -1911,10 +1663,6 @@
/obj/item/stack/spacecash/c10,
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
-"gE" = (
-/obj/effect/decal/cleanable/blood,
-/turf/closed/wall/mineral/titanium,
-/area/awaymission/spacebattle/cruiser)
"gF" = (
/obj/effect/mob_spawn/human/doctor{
mob_name = "Adam Smith";
@@ -1975,12 +1723,6 @@
},
/turf/open/floor/plating/airless,
/area/awaymission/spacebattle/syndicate7)
-"gQ" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 1;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate7)
"gR" = (
/obj/structure/shuttle/engine/heater,
/obj/structure/window/reinforced{
@@ -2039,12 +1781,6 @@
/obj/effect/spawner/structure/window/hollow/reinforced/end,
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
-"hb" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 8;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate7)
"hc" = (
/turf/closed/wall/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate7)
@@ -2198,15 +1934,6 @@
icon_state = "damaged3"
},
/area/awaymission/spacebattle/cruiser)
-"hG" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 4;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate7)
-"hH" = (
-/turf/closed/wall/mineral/titanium,
-/area/awaymission/spacebattle/cruiser)
"hI" = (
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/white,
@@ -2308,16 +2035,10 @@
/obj/item/storage/firstaid/fire,
/turf/open/floor/plasteel/white,
/area/awaymission/spacebattle/cruiser)
-"ia" = (
-/turf/closed/wall/mineral/titanium,
-/area/awaymission/spacebattle/cruiser)
"ib" = (
/obj/machinery/door/unpowered/shuttle,
/turf/open/floor/plasteel/freezer,
/area/awaymission/spacebattle/cruiser)
-"ic" = (
-/turf/closed/wall/mineral/titanium,
-/area/awaymission/spacebattle/cruiser)
"id" = (
/obj/item/storage/firstaid/regular,
/turf/open/floor/plasteel/white,
@@ -2382,11 +2103,6 @@
/obj/machinery/sleep_console,
/turf/open/floor/plasteel/white,
/area/awaymission/spacebattle/cruiser)
-"in" = (
-/turf/closed/wall/mineral/plastitanium{
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate7)
"io" = (
/obj/structure/sink{
dir = 4;
@@ -2456,12 +2172,6 @@
"iz" = (
/turf/closed/wall/mineral/plastitanium,
/area/space/nearstation)
-"iA" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 1;
- icon_state = "diagonalWall3"
- },
-/area/space/nearstation)
"iB" = (
/obj/machinery/sleeper,
/turf/open/floor/mineral/plastitanium/airless,
@@ -2487,21 +2197,9 @@
/obj/item/stack/rods,
/turf/open/floor/mineral/plastitanium/airless,
/area/space/nearstation)
-"iH" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 8;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate5)
"iI" = (
/turf/closed/wall/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate5)
-"iJ" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 1;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate5)
"iK" = (
/obj/machinery/sleeper,
/turf/open/floor/plasteel/airless,
@@ -2513,17 +2211,6 @@
/obj/machinery/computer/shuttle,
/turf/open/floor/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate5)
-"iN" = (
-/turf/closed/wall/mineral/plastitanium{
- icon_state = "diagonalWall3"
- },
-/area/space/nearstation)
-"iO" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 4;
- icon_state = "diagonalWall3"
- },
-/area/space/nearstation)
"iP" = (
/obj/machinery/sleeper,
/turf/open/floor/mineral/plastitanium,
@@ -2550,17 +2237,6 @@
/obj/machinery/door/airlock/external,
/turf/open/floor/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate5)
-"iU" = (
-/turf/closed/wall/mineral/plastitanium{
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate5)
-"iV" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 4;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate5)
"iW" = (
/obj/structure/shuttle/engine/heater,
/obj/structure/window/reinforced{
@@ -2572,21 +2248,9 @@
/obj/structure/shuttle/engine/propulsion,
/turf/open/space,
/area/awaymission/spacebattle/syndicate5)
-"iY" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 8;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate6)
"iZ" = (
/turf/closed/wall/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate6)
-"ja" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 1;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate6)
"jb" = (
/turf/open/floor/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate6)
@@ -2609,17 +2273,6 @@
/obj/machinery/door/airlock/external,
/turf/open/floor/mineral/plastitanium,
/area/awaymission/spacebattle/syndicate6)
-"jg" = (
-/turf/closed/wall/mineral/plastitanium{
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate6)
-"jh" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 4;
- icon_state = "diagonalWall3"
- },
-/area/awaymission/spacebattle/syndicate6)
"ji" = (
/obj/structure/shuttle/engine/heater,
/obj/structure/window/reinforced{
@@ -2952,12 +2605,6 @@
},
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
-"ko" = (
-/obj/effect/spawner/structure/window/hollow/reinforced/end{
- dir = 1
- },
-/turf/open/floor/engine/vacuum,
-/area/awaymission/spacebattle/cruiser)
"kp" = (
/obj/structure/rack,
/obj/item/gun/energy/xray,
@@ -3089,6 +2736,27 @@
/obj/effect/mapping_helpers/planet_z,
/turf/closed/mineral/random,
/area/space/nearstation)
+"vw" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/awaymission/spacebattle/syndicate5)
+"zS" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/awaymission/spacebattle/syndicate6)
+"BO" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/awaymission/spacebattle/syndicate2)
+"Dv" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/awaymission/spacebattle/syndicate3)
+"UZ" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/awaymission/spacebattle/syndicate1)
+"Wv" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/awaymission/spacebattle/cruiser)
+"Yq" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/awaymission/spacebattle/syndicate4)
(1,1,1) = {"
aa
@@ -15808,14 +15476,14 @@ ab
ab
ab
ab
-eq
+er
er
er
fl
fl
er
er
-gA
+er
ab
ab
ab
@@ -16064,16 +15732,16 @@ ab
ab
ab
ab
-eq
er
+Yq
eK
eK
eK
eK
eK
eR
+Yq
er
-gA
ab
ab
ab
@@ -16320,8 +15988,8 @@ ab
ab
ab
ab
-eq
er
+Yq
eR
eK
eK
@@ -16330,8 +15998,8 @@ eK
eK
eK
eR
+Yq
er
-gA
ab
ab
ab
@@ -16589,7 +16257,7 @@ eK
eK
eR
er
-gA
+er
ab
ab
ab
@@ -17874,7 +17542,7 @@ eK
eK
eR
er
-gB
+er
ab
ab
ab
@@ -18119,8 +17787,8 @@ ab
ab
ab
ab
-es
er
+Yq
eR
eK
eK
@@ -18129,8 +17797,8 @@ eK
eK
eK
eR
+Yq
er
-gB
ab
ab
ab
@@ -18377,16 +18045,16 @@ ab
ab
ab
ab
-es
er
+Yq
eK
eK
eK
eK
eK
eR
+Yq
er
-gB
ab
ab
ab
@@ -18635,14 +18303,14 @@ ab
ab
ab
ab
-es
+er
er
er
fl
fl
er
er
-gB
+er
ab
ab
ab
@@ -21382,7 +21050,7 @@ ab
ab
ab
ab
-aO
+aU
aU
aU
bb
@@ -21405,7 +21073,8 @@ aU
aU
aU
aU
-bz
+aU
+aU
ab
ab
ab
@@ -21500,15 +21169,14 @@ ab
ab
ab
ab
-ab
-iH
+iI
iI
iI
iT
iT
iI
iI
-iU
+iI
ab
ab
ab
@@ -21662,9 +21330,9 @@ bx
aU
bh
bh
+UZ
aU
aU
-bz
ab
ab
ab
@@ -21757,16 +21425,16 @@ ab
ab
ab
ab
-iH
iI
+vw
iL
iL
iL
iL
iL
iP
+vw
iI
-iU
ab
ab
ab
@@ -21925,7 +21593,7 @@ aU
aU
aU
aU
-bz
+aU
ab
ab
ab
@@ -22013,8 +21681,8 @@ ab
ab
ab
ab
-iH
iI
+vw
iP
iL
iL
@@ -22023,8 +21691,8 @@ iL
iL
iL
iP
+vw
iI
-iU
ab
ab
ab
@@ -22282,7 +21950,7 @@ iL
iL
iP
iI
-iU
+iI
ab
ab
ab
@@ -22434,13 +22102,13 @@ aU
aY
aY
aY
-bD
+UZ
+aU
aU
aU
aU
aU
aU
-bz
ab
ab
ab
@@ -22733,7 +22401,7 @@ bM
bM
bM
bM
-ch
+bM
cc
cp
cc
@@ -22990,8 +22658,8 @@ bQ
bO
bO
cb
+Wv
bM
-cl
cc
cL
cc
@@ -23567,7 +23235,7 @@ iL
iL
iP
iI
-iV
+iI
ab
ab
ab
@@ -23761,8 +23429,8 @@ bR
dN
kj
bO
+Wv
bM
-co
cx
cN
cM
@@ -23812,8 +23480,8 @@ ab
ab
ab
ab
-iJ
iI
+vw
iP
iL
iL
@@ -23822,8 +23490,8 @@ iL
iL
iL
iP
+vw
iI
-iV
ab
ab
ab
@@ -24018,7 +23686,7 @@ bM
bM
bM
bM
-cj
+bM
cp
cc
cN
@@ -24070,16 +23738,16 @@ ab
ab
ab
ab
-iJ
iI
+vw
iL
iL
iL
iL
iL
iP
+vw
iI
-iV
ab
ab
ab
@@ -24233,13 +23901,13 @@ aU
aY
aY
aY
-bF
+UZ
+aU
aU
aU
aU
aU
aU
-bB
ab
ab
ab
@@ -24328,14 +23996,14 @@ ab
ab
ab
ab
-iJ
+iI
iI
iI
iT
iT
iI
iI
-iV
+iI
ab
ab
ab
@@ -24752,7 +24420,7 @@ aU
aU
aU
aU
-bB
+aU
ab
ab
ab
@@ -25003,9 +24671,9 @@ bf
aU
bh
bh
+UZ
aU
aU
-bB
ab
ab
ab
@@ -25237,7 +24905,7 @@ ab
ab
ab
ab
-aS
+aU
aU
aU
bb
@@ -25260,8 +24928,8 @@ aU
aU
aU
aU
-bB
-ab
+aU
+aU
ab
ab
ab
@@ -27694,14 +27362,14 @@ ab
ab
ab
ab
-iY
+iZ
iZ
iZ
jf
jf
iZ
iZ
-jg
+iZ
ab
ab
ab
@@ -27950,16 +27618,16 @@ ab
ab
ab
ab
-iY
iZ
+zS
jb
jb
jb
jb
jb
jd
+zS
iZ
-jg
ab
ab
ab
@@ -28206,8 +27874,8 @@ ab
ab
ab
ab
-iY
iZ
+zS
jd
jb
jb
@@ -28216,8 +27884,8 @@ jb
jb
jb
jd
+zS
iZ
-jg
ab
ab
ab
@@ -28475,7 +28143,7 @@ jb
jb
jd
iZ
-jg
+iZ
ab
ab
ab
@@ -29760,7 +29428,7 @@ jb
jb
jd
iZ
-jh
+iZ
ab
ab
ab
@@ -30005,8 +29673,8 @@ ab
ab
ab
ab
-ja
iZ
+zS
jd
jb
jb
@@ -30015,8 +29683,8 @@ jb
jb
jb
jd
+zS
iZ
-jh
ab
ab
ab
@@ -30263,16 +29931,16 @@ ab
ab
ab
ab
-ja
iZ
+zS
jb
jb
jb
jb
jb
jd
+zS
iZ
-jh
ab
ab
ab
@@ -30521,14 +30189,14 @@ ab
ab
ab
ab
-ja
+iZ
iZ
iZ
jf
jf
iZ
iZ
-jh
+iZ
ab
ab
ab
@@ -36777,7 +36445,7 @@ ab
ab
ab
ab
-ac
+ah
ah
ah
ak
@@ -36800,8 +36468,8 @@ ah
ah
ah
ah
-aF
-ab
+ah
+ah
ab
ab
ab
@@ -37057,9 +36725,9 @@ an
ah
ao
ao
+BO
ah
ah
-aF
ab
ab
ab
@@ -37320,7 +36988,7 @@ ah
ah
ah
ah
-aF
+ah
ab
ab
ab
@@ -37829,13 +37497,13 @@ ah
aG
aj
aj
-aL
+BO
+ah
ah
ah
ah
ah
ah
-aF
ab
ab
ab
@@ -38087,7 +37755,6 @@ aj
aj
aj
ah
-ac
ah
ah
ah
@@ -38096,7 +37763,8 @@ ah
ah
ah
ah
-aF
+ah
+ah
ab
ab
ab
@@ -38353,8 +38021,8 @@ aZ
aZ
aj
bj
+BO
ah
-aF
ab
ab
ab
@@ -39124,8 +38792,8 @@ ba
ba
aj
aj
+BO
ah
-aH
ab
ab
ab
@@ -39372,7 +39040,6 @@ aj
aj
aj
ah
-ag
ah
ah
ah
@@ -39381,7 +39048,8 @@ ah
ah
ah
ah
-aH
+ah
+ah
ab
ab
ab
@@ -39628,13 +39296,13 @@ ah
aj
aj
aj
-aN
+BO
+ah
ah
ah
ah
ah
ah
-aH
ab
ab
ab
@@ -40147,7 +39815,7 @@ ah
ah
ah
ah
-aH
+ah
ab
ab
ab
@@ -40398,9 +40066,9 @@ aA
ah
ao
ao
+BO
ah
ah
-aH
ab
ab
ab
@@ -40632,7 +40300,7 @@ ab
ab
ab
ab
-ag
+ah
ah
ah
ak
@@ -40655,8 +40323,8 @@ ah
ah
ah
ah
-aH
-ab
+ah
+ah
ab
ab
ab
@@ -45915,7 +45583,7 @@ iF
iF
iz
iz
-iN
+iz
ab
ab
ab
@@ -46173,7 +45841,7 @@ iC
iC
iK
iz
-iN
+iz
ab
ab
ab
@@ -46431,7 +46099,7 @@ iC
iC
iB
iz
-iN
+iz
ab
ab
ab
@@ -46689,7 +46357,7 @@ iC
iC
iB
iz
-iN
+iz
ab
ab
ab
@@ -47974,7 +47642,7 @@ iC
iC
iB
iz
-iO
+iz
ab
ab
ab
@@ -48230,7 +47898,7 @@ iC
iC
iB
iz
-iO
+iz
ab
ab
ab
@@ -48477,7 +48145,7 @@ ab
ab
ab
ab
-iA
+iz
iz
iC
iC
@@ -48486,7 +48154,7 @@ iC
iC
iB
iz
-iO
+iz
ab
ab
ab
@@ -48735,14 +48403,14 @@ ab
ab
ab
ab
-iA
+iz
iz
iz
iF
iF
iz
iz
-iO
+iz
ab
ab
ab
@@ -50159,7 +49827,7 @@ ab
ab
ab
ab
-av
+aB
aB
aB
aE
@@ -50182,8 +49850,8 @@ aB
aB
aB
aB
-bq
-ab
+aB
+aB
ab
ab
ab
@@ -50439,9 +50107,9 @@ aJ
aB
aT
aT
+Dv
aB
aB
-bq
ab
ab
ab
@@ -50702,7 +50370,7 @@ aB
aB
aB
aB
-bq
+aB
ab
ab
ab
@@ -51211,13 +50879,13 @@ aB
aD
aD
aD
-bv
+Dv
+aB
aB
aB
aB
aB
aB
-bq
ab
ab
ab
@@ -51524,7 +51192,7 @@ bM
bM
bM
bM
-dq
+bM
cm
hR
cc
@@ -51781,8 +51449,8 @@ bQ
bO
bO
dc
+Wv
bM
-ch
cp
cc
cc
@@ -52552,8 +52220,8 @@ bR
dN
kj
bO
+Wv
bM
-dI
cc
ca
cc
@@ -52809,7 +52477,7 @@ bM
bM
bM
bM
-ds
+bM
cc
cn
cp
@@ -53010,13 +52678,13 @@ aB
aD
db
aD
-bw
+Dv
+aB
aB
aB
aB
aB
aB
-bs
ab
ab
ab
@@ -53529,7 +53197,7 @@ aB
aB
aB
aB
-bs
+aB
ab
ab
ab
@@ -53780,9 +53448,9 @@ aJ
aB
aT
aT
+Dv
aB
aB
-bs
ab
ab
ab
@@ -54014,7 +53682,7 @@ ab
ab
ab
ab
-az
+aB
aB
aB
aE
@@ -54037,8 +53705,8 @@ aB
aB
aB
aB
-bs
-ab
+aB
+aB
ab
ab
ab
@@ -61820,7 +61488,7 @@ ab
ab
ab
ab
-hb
+hc
hi
hu
hu
@@ -61828,7 +61496,7 @@ hu
hu
hu
hu
-in
+hc
ab
ab
ab
@@ -62590,7 +62258,7 @@ ab
ab
ab
ab
-gQ
+hc
hc
hk
hk
@@ -62600,7 +62268,7 @@ hk
hk
hk
hc
-hG
+hc
ab
ab
ab
@@ -64390,15 +64058,15 @@ ab
ab
ab
ab
-gQ
+hc
hm
hv
-hG
+hc
ab
-gQ
+hc
hm
hv
-hG
+hc
ab
ab
ab
diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm
new file mode 100644
index 0000000000..f522d569c1
--- /dev/null
+++ b/_maps/_basemap.dm
@@ -0,0 +1,25 @@
+//#define LOWMEMORYMODE //uncomment this to load centcom and runtime station and thats it.
+
+#include "map_files\generic\CentCom.dmm"
+#include "map_files\generic\SpaceStation.dmm"
+
+#ifndef LOWMEMORYMODE
+
+ #include "map_files\generic\Space.dmm"
+ #include "map_files\generic\SpaceDock.dmm"
+ #include "map_files\Mining\Lavaland.dmm"
+ #include "map_files\generic\City_of_Cogs.dmm"
+
+ #ifdef ALL_MAPS
+ #include "map_files\debug\runtimestation.dmm"
+ #include "cit_map_files\Deltastation\DeltaStation2.dmm"
+ #include "cit_map_files\MetaStation\MetaStation.dmm"
+ #include "cit_map_files\OmegaStation\OmegaStation.dmm"
+ #include "cit_map_files\PubbyStation\PubbyStation.dmm"
+ #include "cit_map_files\BoxStation\BoxStation.dmm"
+
+ #ifdef TRAVISBUILDING
+ #include "templates.dm"
+ #endif
+ #endif
+#endif
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index f1b2f9bf66..eebfbcb040 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -57126,15 +57126,12 @@
/area/science/circuit)
"Qpp" = (
/turf/closed/wall,
-/turf/open/floor/circuit,
/area/science/circuit)
"Qpq" = (
/turf/closed/wall,
-/turf/open/floor/circuit,
/area/science/circuit)
"Qpr" = (
/turf/closed/wall,
-/turf/open/floor/circuit,
/area/science/circuit)
"Qps" = (
/turf/closed/wall/r_wall,
@@ -57155,7 +57152,6 @@
/area/maintenance/starboard/aft)
"Qpw" = (
/turf/closed/wall,
-/turf/open/floor/circuit,
/area/science/circuit)
"Qpx" = (
/obj/structure/table/reinforced,
@@ -57186,7 +57182,6 @@
/area/maintenance/starboard/aft)
"QpB" = (
/turf/closed/wall,
-/turf/open/floor/circuit,
/area/science/circuit)
"QpC" = (
/obj/structure/table/reinforced,
@@ -57212,7 +57207,6 @@
/area/science/circuit)
"QpG" = (
/turf/closed/wall,
-/turf/open/floor/circuit,
/area/science/circuit)
"QpH" = (
/turf/open/floor/plasteel/white,
@@ -57229,7 +57223,6 @@
/area/science/circuit)
"QpK" = (
/turf/closed/wall,
-/turf/open/floor/circuit,
/area/science/circuit)
"QpL" = (
/turf/open/floor/plasteel/white,
@@ -57243,7 +57236,6 @@
/area/science/circuit)
"QpO" = (
/turf/closed/wall,
-/turf/open/floor/circuit,
/area/science/circuit)
"QpP" = (
/obj/machinery/light_switch{
@@ -57264,9 +57256,8 @@
/turf/open/floor/plasteel,
/area/science/circuit)
"QpS" = (
-/turf/closed/wall,
/obj/structure/sign/nanotrasen,
-/turf/open/floor/circuit,
+/turf/closed/wall,
/area/science/circuit)
"QpT" = (
/obj/machinery/light{
@@ -57367,16 +57358,14 @@
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"Qqg" = (
-/turf/closed/wall,
/obj/structure/sign/nanotrasen,
-/turf/open/floor/circuit,
+/turf/closed/wall,
/area/science/circuit)
"Qqh" = (
-/turf/open/floor/plasteel/white,
/obj/structure/table/reinforced,
/obj/item/paper_bin,
/obj/item/pen,
-/turf/open/floor/circuit,
+/turf/open/floor/plasteel/white,
/area/science/circuit)
"Qqi" = (
/obj/machinery/light{
@@ -57391,7 +57380,6 @@
/area/science/misc_lab)
"Qqk" = (
/turf/closed/wall,
-/turf/open/floor/circuit,
/area/science/circuit)
"Qql" = (
/obj/structure/table/reinforced,
@@ -57413,7 +57401,6 @@
/area/science/circuit)
"Qqo" = (
/turf/closed/wall,
-/turf/open/floor/circuit,
/area/science/circuit)
"Qqp" = (
/obj/structure/table/reinforced,
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index dc82b90d33..e20c29861a 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -19457,7 +19457,6 @@
/turf/open/floor/plasteel/redyellow/side,
/area/security/prison)
"aPt" = (
-/turf/open/floor/plasteel/redyellow/side,
/obj/machinery/vending/sustenance,
/turf/open/floor/plating{
icon_state = "platingdmg2"
@@ -59948,7 +59947,6 @@
/turf/open/floor/plating,
/area/maintenance/starboard)
"crA" = (
-/turf/open/floor/plating,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating{
icon_state = "platingdmg2"
diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm
index 1297107dd7..d6a7308f19 100644
--- a/_maps/map_files/OmegaStation/OmegaStation.dmm
+++ b/_maps/map_files/OmegaStation/OmegaStation.dmm
@@ -2113,7 +2113,6 @@
/turf/open/floor/plasteel,
/area/asteroid/nearstation)
"aep" = (
-/turf/open/floor/plating,
/turf/open/floor/plating{
icon_state = "platingdmg2"
},
diff --git a/_maps/shuttles/emergency_mini.dmm b/_maps/shuttles/emergency_mini.dmm
index 6a4d35124c..d7d5644336 100644
--- a/_maps/shuttles/emergency_mini.dmm
+++ b/_maps/shuttles/emergency_mini.dmm
@@ -195,7 +195,6 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"F" = (
-/turf/closed/wall/mineral/titanium,
/obj/structure/table,
/obj/item/storage/firstaid/fire,
/obj/item/storage/firstaid/regular{
@@ -204,7 +203,7 @@
},
/obj/item/crowbar,
/obj/item/extinguisher,
-/turf/open/floor/mineral/titanium,
+/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"G" = (
/turf/closed/wall/mineral/titanium,
@@ -246,11 +245,10 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"N" = (
-/turf/closed/wall/mineral/titanium,
/obj/machinery/computer/security{
dir = 8
},
-/turf/open/floor/mineral/titanium,
+/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"O" = (
/obj/machinery/computer/crew{
diff --git a/_maps/templates/medium_shuttle1.dmm b/_maps/templates/medium_shuttle1.dmm
index 07cad627cb..80833ada8d 100644
--- a/_maps/templates/medium_shuttle1.dmm
+++ b/_maps/templates/medium_shuttle1.dmm
@@ -20,19 +20,6 @@
"d" = (
/turf/closed/wall/mineral/plastitanium,
/area/ruin/powered/shuttle/medium_1)
-"e" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 1;
- icon_state = "diagonalWall3"
- },
-/area/ruin/powered/shuttle/medium_1)
-"f" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 4;
- icon_state = "diagonalWall3"
- },
-/turf/closed/wall/mineral/titanium,
-/area/ruin/powered/shuttle/medium_1)
"g" = (
/turf/closed/wall/mineral/titanium,
/area/ruin/powered/shuttle/medium_1)
@@ -100,19 +87,6 @@
},
/turf/open/space,
/area/ruin/powered/shuttle/medium_1)
-"x" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 1;
- icon_state = "diagonalWall3"
- },
-/turf/closed/wall/mineral/titanium,
-/area/ruin/powered/shuttle/medium_1)
-"y" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 4;
- icon_state = "diagonalWall3"
- },
-/area/ruin/powered/shuttle/medium_1)
(1,1,1) = {"
a
@@ -202,7 +176,7 @@ c
(6,1,1) = {"
d
d
-f
+g
g
k
g
@@ -212,7 +186,7 @@ g
g
k
g
-x
+g
d
d
"}
@@ -248,10 +222,10 @@ j
j
g
d
-y
+d
"}
(9,1,1) = {"
-e
+d
d
g
j
@@ -264,12 +238,12 @@ g
j
j
g
-y
+d
a
"}
(10,1,1) = {"
a
-e
+d
g
g
g
diff --git a/_maps/templates/medium_shuttle2.dmm b/_maps/templates/medium_shuttle2.dmm
index 537d1db934..3b46d40382 100644
--- a/_maps/templates/medium_shuttle2.dmm
+++ b/_maps/templates/medium_shuttle2.dmm
@@ -20,37 +20,18 @@
"d" = (
/turf/closed/wall/mineral/plastitanium,
/area/ruin/powered/shuttle/medium_2)
-"e" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 1;
- icon_state = "diagonalWall3"
- },
-/area/ruin/powered/shuttle/medium_2)
"f" = (
/obj/structure/shuttle/engine/propulsion/burst/right{
dir = 8
},
/turf/open/space,
/area/ruin/powered/shuttle/medium_2)
-"g" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 4;
- icon_state = "diagonalWall3"
- },
-/turf/closed/wall/mineral/titanium,
-/area/ruin/powered/shuttle/medium_2)
"h" = (
/turf/closed/wall/mineral/titanium,
/area/ruin/powered/shuttle/medium_2)
"i" = (
/turf/closed/wall/mineral/titanium/overspace,
/area/ruin/powered/shuttle/medium_2)
-"j" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 8;
- icon_state = "diagonalWall3"
- },
-/area/ruin/powered/shuttle/medium_2)
"k" = (
/turf/open/floor/plasteel/dark,
/area/ruin/powered/shuttle/medium_2)
@@ -71,11 +52,6 @@
"p" = (
/turf/open/floor/plasteel/darkyellow,
/area/ruin/powered/shuttle/medium_2)
-"q" = (
-/turf/closed/wall/mineral/plastitanium{
- icon_state = "diagonalWall3"
- },
-/area/ruin/powered/shuttle/medium_2)
"r" = (
/obj/structure/table,
/turf/open/floor/plasteel,
@@ -114,19 +90,6 @@
},
/turf/open/floor/plasteel/darkyellow,
/area/ruin/powered/shuttle/medium_2)
-"z" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 1;
- icon_state = "diagonalWall3"
- },
-/turf/closed/wall/mineral/titanium,
-/area/ruin/powered/shuttle/medium_2)
-"A" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 4;
- icon_state = "diagonalWall3"
- },
-/area/ruin/powered/shuttle/medium_2)
"B" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ruin/powered/shuttle/medium_2)
@@ -179,15 +142,15 @@ a
(4,1,1) = {"
b
f
-j
d
d
-q
+d
+d
a
-j
d
d
-q
+d
+d
b
f
"}
@@ -196,11 +159,11 @@ c
c
d
d
-g
+h
h
l
h
-z
+h
d
d
c
@@ -209,7 +172,7 @@ c
(6,1,1) = {"
d
d
-g
+h
h
h
r
@@ -217,7 +180,7 @@ m
r
h
h
-z
+h
d
d
"}
@@ -238,7 +201,7 @@ d
"}
(8,1,1) = {"
d
-g
+h
h
n
h
@@ -248,7 +211,7 @@ B
h
n
h
-z
+h
d
"}
(9,1,1) = {"
@@ -267,7 +230,7 @@ h
d
"}
(10,1,1) = {"
-e
+d
h
k
k
@@ -279,7 +242,7 @@ h
k
k
h
-A
+d
"}
(11,1,1) = {"
a
diff --git a/_maps/templates/medium_shuttle3.dmm b/_maps/templates/medium_shuttle3.dmm
index 263c52c416..6e9f935242 100644
--- a/_maps/templates/medium_shuttle3.dmm
+++ b/_maps/templates/medium_shuttle3.dmm
@@ -17,34 +17,13 @@
},
/turf/open/floor/plating/airless,
/area/ruin/powered/shuttle/medium_3)
-"e" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 8;
- icon_state = "diagonalWall3"
- },
-/area/ruin/powered/shuttle/medium_3)
-"f" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 1;
- icon_state = "diagonalWall3"
- },
-/area/ruin/powered/shuttle/medium_3)
"g" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 4;
- icon_state = "diagonalWall3"
- },
+/turf/closed/wall/mineral/plastitanium,
/turf/closed/wall/mineral/titanium,
/area/ruin/powered/shuttle/medium_3)
"h" = (
/turf/closed/wall/mineral/titanium,
/area/ruin/powered/shuttle/medium_3)
-"i" = (
-/turf/closed/wall/mineral/plastitanium{
- icon_state = "diagonalWall3"
- },
-/turf/closed/wall/mineral/titanium,
-/area/ruin/powered/shuttle/medium_3)
"j" = (
/obj/machinery/door/airlock/external/glass,
/turf/open/floor/plating,
@@ -87,24 +66,10 @@
},
/turf/open/space,
/area/ruin/powered/shuttle/medium_3)
-"s" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 1;
- icon_state = "diagonalWall3"
- },
-/turf/closed/wall/mineral/titanium,
-/area/ruin/powered/shuttle/medium_3)
"t" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/ruin/powered/shuttle/medium_3)
-"u" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 8;
- icon_state = "diagonalWall3"
- },
-/turf/closed/wall/mineral/titanium,
-/area/ruin/powered/shuttle/medium_3)
"v" = (
/obj/structure/table,
/turf/open/floor/plasteel/darkyellow,
@@ -118,11 +83,6 @@
},
/turf/open/floor/plasteel/darkyellow,
/area/ruin/powered/shuttle/medium_3)
-"y" = (
-/turf/closed/wall/mineral/plastitanium{
- icon_state = "diagonalWall3"
- },
-/area/ruin/powered/shuttle/medium_3)
"z" = (
/obj/machinery/sleeper,
/turf/open/floor/plasteel/darkblue,
@@ -130,12 +90,6 @@
"A" = (
/turf/open/floor/plasteel/dark,
/area/ruin/powered/shuttle/medium_3)
-"B" = (
-/turf/closed/wall/mineral/plastitanium{
- dir = 4;
- icon_state = "diagonalWall3"
- },
-/area/ruin/powered/shuttle/medium_3)
"C" = (
/turf/open/floor/plasteel/darkblue,
/area/ruin/powered/shuttle/medium_3)
@@ -210,18 +164,18 @@ a
a
a
a
-e
+c
o
c
c
-y
+c
a
a
-e
+c
c
c
o
-y
+c
a
a
a
@@ -233,7 +187,7 @@ a
a
a
a
-e
+c
c
c
c
@@ -246,7 +200,7 @@ c
c
c
c
-y
+c
a
a
a
@@ -256,22 +210,22 @@ a
a
a
a
-e
-g
-h
-h
-s
-c
-g
-j
-j
-s
c
g
h
h
-s
-y
+g
+c
+g
+j
+j
+g
+c
+g
+h
+h
+g
+c
a
a
a
@@ -279,7 +233,7 @@ a
(6,1,1) = {"
a
a
-e
+c
c
h
k
@@ -296,7 +250,7 @@ l
k
h
c
-y
+c
a
a
"}
@@ -329,7 +283,7 @@ a
c
c
c
-i
+g
G
l
l
@@ -342,7 +296,7 @@ l
l
l
G
-u
+g
c
c
c
@@ -375,7 +329,7 @@ F
(10,1,1) = {"
a
a
-f
+c
c
g
G
@@ -390,9 +344,9 @@ A
G
p
G
-s
+g
+c
c
-B
a
a
"}
@@ -447,9 +401,9 @@ a
(13,1,1) = {"
a
a
-e
c
-i
+c
+g
G
p
G
@@ -462,9 +416,9 @@ A
G
p
G
-u
+g
+c
c
-y
a
a
"}
@@ -510,7 +464,7 @@ l
l
l
G
-s
+g
c
c
c
@@ -543,7 +497,7 @@ a
(17,1,1) = {"
a
a
-f
+c
c
h
k
@@ -560,7 +514,7 @@ l
k
h
c
-B
+c
a
a
"}
@@ -568,22 +522,22 @@ a
a
a
a
-f
-i
-h
-h
-u
c
-i
+g
+h
+h
+g
+c
+g
j
j
-u
+g
c
-i
+g
h
h
-u
-B
+g
+c
a
a
a
@@ -593,7 +547,7 @@ a
a
a
a
-f
+c
c
c
c
@@ -606,7 +560,7 @@ c
c
c
c
-B
+c
a
a
a
@@ -618,18 +572,18 @@ a
a
a
a
-f
+c
q
c
c
-B
+c
a
a
-f
+c
c
c
q
-B
+c
a
a
a
diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm
index 0c735844f8..6f4aa69277 100644
--- a/code/__DEFINES/atmospherics.dm
+++ b/code/__DEFINES/atmospherics.dm
@@ -86,16 +86,18 @@
#define HAZARD_LOW_PRESSURE 20 //This is when the black ultra-low pressure icon is displayed. (This one is set as a constant)
#define TEMPERATURE_DAMAGE_COEFFICIENT 1.5 //This is used in handle_temperature_damage() for humans, and in reagents that affect body temperature. Temperature damage is multiplied by this amount.
-#define BODYTEMP_AUTORECOVERY_DIVISOR 12 //This is the divisor which handles how much of the temperature difference between the current body temperature and 310.15K (optimal temperature) humans auto-regenerate each tick. The higher the number, the slower the recovery. This is applied each tick, so long as the mob is alive.
-#define BODYTEMP_AUTORECOVERY_MINIMUM 10 //Minimum amount of kelvin moved toward 310.15K per tick. So long as abs(310.15 - bodytemp) is more than 50.
-#define BODYTEMP_NORMAL 310.15 //98.6F, or 37C, the normal temprature of the human body.
-#define BODYTEMP_COLD_DIVISOR 6 //Similar to the BODYTEMP_AUTORECOVERY_DIVISOR, but this is the divisor which is applied at the stage that follows autorecovery. This is the divisor which comes into play when the human's loc temperature is lower than their body temperature. Make it lower to lose bodytemp faster.
-#define BODYTEMP_HEAT_DIVISOR 6 //Similar to the BODYTEMP_AUTORECOVERY_DIVISOR, but this is the divisor which is applied at the stage that follows autorecovery. This is the divisor which comes into play when the human's loc temperature is higher than their body temperature. Make it lower to gain bodytemp faster.
-#define BODYTEMP_COOLING_MAX 30 //The maximum number of degrees that your body can cool in 1 tick, when in a cold area.
-#define BODYTEMP_HEATING_MAX 30 //The maximum number of degrees that your body can heat up in 1 tick, when in a hot area.
-#define BODYTEMP_HEAT_DAMAGE_LIMIT 360.15 // The limit the human body can take before it starts taking damage from heat.
-#define BODYTEMP_COLD_DAMAGE_LIMIT 260.15 // The limit the human body can take before it starts taking damage from coldness.
+#define BODYTEMP_NORMAL 310.15 //The natural temperature for a body
+#define BODYTEMP_AUTORECOVERY_DIVISOR 11 //This is the divisor which handles how much of the temperature difference between the current body temperature and 310.15K (optimal temperature) humans auto-regenerate each tick. The higher the number, the slower the recovery. This is applied each tick, so long as the mob is alive.
+#define BODYTEMP_AUTORECOVERY_MINIMUM 12 //Minimum amount of kelvin moved toward 310K per tick. So long as abs(310.15 - bodytemp) is more than 50.
+#define BODYTEMP_COLD_DIVISOR 6 //Similar to the BODYTEMP_AUTORECOVERY_DIVISOR, but this is the divisor which is applied at the stage that follows autorecovery. This is the divisor which comes into play when the human's loc temperature is lower than their body temperature. Make it lower to lose bodytemp faster.
+#define BODYTEMP_HEAT_DIVISOR 15 //Similar to the BODYTEMP_AUTORECOVERY_DIVISOR, but this is the divisor which is applied at the stage that follows autorecovery. This is the divisor which comes into play when the human's loc temperature is higher than their body temperature. Make it lower to gain bodytemp faster.
+#define BODYTEMP_COOLING_MAX -100 //The maximum number of degrees that your body can cool in 1 tick, due to the environment, when in a cold area.
+#define BODYTEMP_HEATING_MAX 30 //The maximum number of degrees that your body can heat up in 1 tick, due to the environment, when in a hot area.
+
+#define BODYTEMP_HEAT_DAMAGE_LIMIT (BODYTEMP_NORMAL + 50) // The limit the human body can take before it starts taking damage from heat.
+#define BODYTEMP_COLD_DAMAGE_LIMIT (BODYTEMP_NORMAL - 50) // The limit the human body can take before it starts taking damage from coldness.
+
#define SPACE_HELM_MIN_TEMP_PROTECT 2.0 //what min_cold_protection_temperature is set to for space-helmet quality headwear. MUST NOT BE 0.
#define SPACE_HELM_MAX_TEMP_PROTECT 1500 //Thermal insulation works both ways /Malkevin
diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm
index 4773cf0664..6e223446fd 100644
--- a/code/__DEFINES/subsystems.dm
+++ b/code/__DEFINES/subsystems.dm
@@ -75,36 +75,31 @@
// Subsystem fire priority, from lowest to highest priority
// If the subsystem isn't listed here it's either DEFAULT or PROCESS (if it's a processing subsystem child)
-#define FIRE_PRIORITY_IDLE_NPC 1
-#define FIRE_PRIORITY_SERVER_MAINT 1
-
-#define FIRE_PRIORITY_GARBAGE 4
-#define FIRE_PRIORITY_RESEARCH 4
-#define FIRE_PRIORITY_AIR 5
-#define FIRE_PRIORITY_NPC 5
-#define FIRE_PRIORITY_PROCESS 6
-#define FIRE_PRIORITY_THROWING 6
-#define FIRE_PRIORITY_FLIGHTPACKS 7
-#define FIRE_PRIORITY_SPACEDRIFT 7
-#define FIRE_PRIOTITY_SMOOTHING 8
-#define FIRE_PRIORITY_ORBIT 8
-#define FIRE_PRIORITY_OBJ 9
-#define FIRE_PRIORUTY_FIELDS 9
-#define FIRE_PRIORITY_ACID 9
-#define FIRE_PRIOTITY_BURNING 9
-#define FIRE_PRIORITY_INBOUNDS 9
-
-#define FIRE_PRIORITY_DEFAULT 10
-
-#define FIRE_PRIORITY_PARALLAX 11
-#define FIRE_PRIORITY_NETWORKS 12
-#define FIRE_PRIORITY_MOBS 13
-#define FIRE_PRIORITY_TGUI 14
-
-#define FIRE_PRIORITY_TICKER 19
-#define FIRE_PRIORITY_OVERLAYS 20
-
-#define FIRE_PRIORITY_INPUT 100 // This must always always be the max highest priority. Player input must never be lost.
+#define FIRE_PRIORITY_IDLE_NPC 10
+#define FIRE_PRIORITY_SERVER_MAINT 10
+#define FIRE_PRIORITY_GARBAGE 15
+#define FIRE_PRIORITY_RESEARCH 15
+#define FIRE_PRIORITY_AIR 20
+#define FIRE_PRIORITY_NPC 20
+#define FIRE_PRIORITY_PROCESS 25
+#define FIRE_PRIORITY_THROWING 25
+#define FIRE_PRIORITY_FLIGHTPACKS 30
+#define FIRE_PRIORITY_SPACEDRIFT 30
+#define FIRE_PRIOTITY_SMOOTHING 35
+#define FIRE_PRIORITY_ORBIT 35
+#define FIRE_PRIORITY_OBJ 40
+#define FIRE_PRIORUTY_FIELDS 40
+#define FIRE_PRIORITY_ACID 40
+#define FIRE_PRIOTITY_BURNING 40
+#define FIRE_PRIORITY_INBOUNDS 40
+#define FIRE_PRIORITY_DEFAULT 50
+#define FIRE_PRIORITY_PARALLAX 65
+#define FIRE_PRIORITY_NETWORKS 80
+#define FIRE_PRIORITY_MOBS 100
+#define FIRE_PRIORITY_TGUI 110
+#define FIRE_PRIORITY_TICKER 200
+#define FIRE_PRIORITY_OVERLAYS 500
+#define FIRE_PRIORITY_INPUT 1000 // This must always always be the max highest priority. Player input must never be lost.
// SS runlevels
diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm
index 67ec38bdcf..2d200438ef 100644
--- a/code/__HELPERS/game.dm
+++ b/code/__HELPERS/game.dm
@@ -15,10 +15,10 @@
return T ? T.loc : null
/proc/get_area_name(atom/X, format_text = FALSE)
- var/area/Y = get_area(X)
- if(format_text)
- return format_text(Y.name)
- return Y.name
+ var/area/A = isarea(X) ? X : get_area(X)
+ if(!A)
+ return null
+ return format_text ? format_text(A.name) : A.name
/proc/get_area_by_name(N) //get area by its name
for(var/area/A in world)
diff --git a/code/_compile_options.dm b/code/_compile_options.dm
index c0985281c5..5e2cca0cc9 100644
--- a/code/_compile_options.dm
+++ b/code/_compile_options.dm
@@ -18,6 +18,9 @@
#endif // 1 to use the default behaviour;
// 2 for preloading absolutely everything;
+#ifdef LOWMEMORYMODE
+#define FORCE_MAP "_maps/runtimestation.json"
+#endif
#define BACKGROUND_ENABLED 0 // The default value for all uses of set background. Set background can cause gradual lag and is recommended you only turn this on if necessary.
// 1 will enable set background. 0 will disable set background.
diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm
index ad295167cf..14c752613b 100644
--- a/code/_globalvars/lists/objects.dm
+++ b/code/_globalvars/lists/objects.dm
@@ -38,4 +38,4 @@ GLOBAL_LIST_EMPTY(wire_name_directory)
GLOBAL_LIST_EMPTY(ai_status_displays)
GLOBAL_LIST_EMPTY(mob_spawners) // All mob_spawn objects
-GLOBAL_LIST_EMPTY(alert_consoles) // Station alert consoles, /obj/machinery/computer/station_alert
\ No newline at end of file
+GLOBAL_LIST_EMPTY(alert_consoles) // Station alert consoles, /obj/machinery/computer/station_alert
diff --git a/code/_onclick/hud/ghost.dm b/code/_onclick/hud/ghost.dm
index acda7f36e5..50bf9c9222 100644
--- a/code/_onclick/hud/ghost.dm
+++ b/code/_onclick/hud/ghost.dm
@@ -1,84 +1,87 @@
-/obj/screen/ghost
- icon = 'icons/mob/screen_ghost.dmi'
-
-/obj/screen/ghost/MouseEntered()
- flick(icon_state + "_anim", src)
-
-/obj/screen/ghost/jumptomob
- name = "Jump to mob"
- icon_state = "jumptomob"
-
-/obj/screen/ghost/jumptomob/Click()
- var/mob/dead/observer/G = usr
- G.jumptomob()
-
-/obj/screen/ghost/orbit
- name = "Orbit"
- icon_state = "orbit"
-
-/obj/screen/ghost/orbit/Click()
- var/mob/dead/observer/G = usr
- G.follow()
-
-/obj/screen/ghost/reenter_corpse
- name = "Reenter corpse"
- icon_state = "reenter_corpse"
-
-/obj/screen/ghost/reenter_corpse/Click()
- var/mob/dead/observer/G = usr
- G.reenter_corpse()
-
-/obj/screen/ghost/teleport
- name = "Teleport"
- icon_state = "teleport"
-
-/obj/screen/ghost/teleport/Click()
- var/mob/dead/observer/G = usr
- G.dead_tele()
-
-/obj/screen/ghost/pai
- name = "pAI Candidate"
- icon_state = "pai"
-
-/obj/screen/ghost/pai/Click()
- var/mob/dead/observer/G = usr
- G.register_pai()
-
-/datum/hud/ghost/New(mob/owner, ui_style = 'icons/mob/screen_midnight.dmi')
- ..()
- var/obj/screen/using
-
- using = new /obj/screen/ghost/jumptomob()
- using.screen_loc = ui_ghost_jumptomob
- static_inventory += using
-
- using = new /obj/screen/ghost/orbit()
- using.screen_loc = ui_ghost_orbit
- static_inventory += using
-
- using = new /obj/screen/ghost/reenter_corpse()
- using.screen_loc = ui_ghost_reenter_corpse
- static_inventory += using
-
- using = new /obj/screen/ghost/teleport()
- using.screen_loc = ui_ghost_teleport
- static_inventory += using
-
- using = new /obj/screen/ghost/pai()
- using.screen_loc = ui_ghost_pai
- static_inventory += using
-
- using = new /obj/screen/language_menu
- using.icon = ui_style
- static_inventory += using
-
-/datum/hud/ghost/show_hud(version = 0, mob/viewmob)
- ..()
- if(!mymob.client.prefs.ghost_hud)
- mymob.client.screen -= static_inventory
- else
- mymob.client.screen += static_inventory
-
-/mob/dead/observer/create_mob_hud()
- if(client && !hud_used)
- hud_used = new /datum/hud/ghost(src, ui_style2icon(client.prefs.UI_style))
+/obj/screen/ghost
+ icon = 'icons/mob/screen_ghost.dmi'
+
+/obj/screen/ghost/MouseEntered()
+ flick(icon_state + "_anim", src)
+
+/obj/screen/ghost/jumptomob
+ name = "Jump to mob"
+ icon_state = "jumptomob"
+
+/obj/screen/ghost/jumptomob/Click()
+ var/mob/dead/observer/G = usr
+ G.jumptomob()
+
+/obj/screen/ghost/orbit
+ name = "Orbit"
+ icon_state = "orbit"
+
+/obj/screen/ghost/orbit/Click()
+ var/mob/dead/observer/G = usr
+ G.follow()
+
+/obj/screen/ghost/reenter_corpse
+ name = "Reenter corpse"
+ icon_state = "reenter_corpse"
+
+/obj/screen/ghost/reenter_corpse/Click()
+ var/mob/dead/observer/G = usr
+ G.reenter_corpse()
+
+/obj/screen/ghost/teleport
+ name = "Teleport"
+ icon_state = "teleport"
+
+/obj/screen/ghost/teleport/Click()
+ var/mob/dead/observer/G = usr
+ G.dead_tele()
+
+/obj/screen/ghost/pai
+ name = "pAI Candidate"
+ icon_state = "pai"
+
+/obj/screen/ghost/pai/Click()
+ var/mob/dead/observer/G = usr
+ G.register_pai()
+
+/datum/hud/ghost/New(mob/owner, ui_style = 'icons/mob/screen_midnight.dmi')
+ ..()
+ var/obj/screen/using
+
+ using = new /obj/screen/ghost/jumptomob()
+ using.screen_loc = ui_ghost_jumptomob
+ static_inventory += using
+
+ using = new /obj/screen/ghost/orbit()
+ using.screen_loc = ui_ghost_orbit
+ static_inventory += using
+
+ using = new /obj/screen/ghost/reenter_corpse()
+ using.screen_loc = ui_ghost_reenter_corpse
+ static_inventory += using
+
+ using = new /obj/screen/ghost/teleport()
+ using.screen_loc = ui_ghost_teleport
+ static_inventory += using
+
+ using = new /obj/screen/ghost/pai()
+ using.screen_loc = ui_ghost_pai
+ static_inventory += using
+
+ using = new /obj/screen/language_menu
+ using.icon = ui_style
+ static_inventory += using
+
+/datum/hud/ghost/show_hud(version = 0, mob/viewmob)
+ . = ..()
+ if(!.)
+ return
+ var/mob/screenmob = viewmob || mymob
+ if(!screenmob.client.prefs.ghost_hud)
+ screenmob.client.screen -= static_inventory
+ else
+ screenmob.client.screen += static_inventory
+
+/mob/dead/observer/create_mob_hud()
+ if(client && !hud_used)
+ hud_used = new /datum/hud/ghost(src, ui_style2icon(client.prefs.UI_style))
diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm
index a212d46f99..5693e9c47e 100644
--- a/code/_onclick/hud/hud.dm
+++ b/code/_onclick/hud/hud.dm
@@ -7,11 +7,10 @@
/datum/hud
var/mob/mymob
- var/hud_shown = 1 //Used for the HUD toggle (F12)
- var/hud_version = 1 //Current displayed version of the HUD
- var/inventory_shown = 0 //Equipped item inventory
- var/show_intent_icons = 0
- var/hotkey_ui_hidden = 0 //This is to hide the buttons that can be used via hotkeys. (hotkeybuttons list of buttons)
+ var/hud_shown = TRUE //Used for the HUD toggle (F12)
+ var/hud_version = HUD_STYLE_STANDARD //Current displayed version of the HUD
+ var/inventory_shown = FALSE //Equipped item inventory
+ var/hotkey_ui_hidden = FALSE //This is to hide the buttons that can be used via hotkeys. (hotkeybuttons list of buttons)
var/obj/screen/ling/chems/lingchemdisplay
var/obj/screen/ling/sting/lingstingdisplay
@@ -23,7 +22,6 @@
var/obj/screen/devil/soul_counter/devilsouldisplay
- var/obj/screen/nightvisionicon
var/obj/screen/action_intent
var/obj/screen/zone_select
var/obj/screen/pull_icon
@@ -40,7 +38,7 @@
var/list/obj/screen/plane_master/plane_masters = list() // see "appearance_flags" in the ref, assoc list of "[plane]" = object
var/obj/screen/movable/action_button/hide_toggle/hide_actions_toggle
- var/action_buttons_hidden = 0
+ var/action_buttons_hidden = FALSE
var/obj/screen/healths
var/obj/screen/healthdoll
@@ -111,7 +109,6 @@
blobpwrdisplay = null
alien_plasma_display = null
alien_queen_finder = null
- nightvisionicon = null
if(plane_masters.len)
for(var/thing in plane_masters)
@@ -134,10 +131,10 @@
//Version denotes which style should be displayed. blank or 0 means "next version"
/datum/hud/proc/show_hud(version = 0,mob/viewmob)
if(!ismob(mymob))
- return 0
+ return FALSE
var/mob/screenmob = viewmob || mymob
if(!screenmob.client)
- return 0
+ return FALSE
screenmob.client.screen = list()
screenmob.client.apply_clickcatcher()
@@ -150,7 +147,7 @@
switch(display_hud_version)
if(HUD_STYLE_STANDARD) //Default HUD
- hud_shown = 1 //Governs behavior of other procs
+ hud_shown = TRUE //Governs behavior of other procs
if(static_inventory.len)
screenmob.client.screen += static_inventory
if(toggleable_inventory.len && screenmob.hud_used && screenmob.hud_used.inventory_shown)
@@ -166,7 +163,7 @@
action_intent.screen_loc = initial(action_intent.screen_loc) //Restore intent selection to the original position
if(HUD_STYLE_REDUCED) //Reduced HUD
- hud_shown = 0 //Governs behavior of other procs
+ hud_shown = FALSE //Governs behavior of other procs
if(static_inventory.len)
screenmob.client.screen -= static_inventory
if(toggleable_inventory.len)
@@ -186,7 +183,7 @@
action_intent.screen_loc = ui_acti_alt //move this to the alternative position, where zone_select usually is.
if(HUD_STYLE_NOHUD) //No HUD
- hud_shown = 0 //Governs behavior of other procs
+ hud_shown = FALSE //Governs behavior of other procs
if(static_inventory.len)
screenmob.client.screen -= static_inventory
if(toggleable_inventory.len)
@@ -201,17 +198,23 @@
hud_version = display_hud_version
persistent_inventory_update(screenmob)
- mymob.update_action_buttons(1)
+ screenmob.update_action_buttons(1)
reorganize_alerts()
- mymob.reload_fullscreen()
+ screenmob.reload_fullscreen()
update_parallax_pref(screenmob)
+ return TRUE
/datum/hud/human/show_hud(version = 0,mob/viewmob)
- ..()
- hidden_inventory_update(viewmob)
+ . = ..()
+ if(!.)
+ return
+ var/mob/screenmob = viewmob || mymob
+ hidden_inventory_update(screenmob)
/datum/hud/robot/show_hud(version = 0, mob/viewmob)
- ..()
+ . = ..()
+ if(!.)
+ return
update_robot_modules_display()
/datum/hud/proc/hidden_inventory_update()
@@ -224,7 +227,7 @@
//Triggered when F12 is pressed (Unless someone changed something in the DMF)
/mob/verb/button_pressed_F12()
set name = "F12"
- set hidden = 1
+ set hidden = TRUE
if(hud_used && client)
hud_used.show_hud() //Shows the next hud preset
diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm
index fe53528155..f9f1849c87 100644
--- a/code/_onclick/hud/human.dm
+++ b/code/_onclick/hud/human.dm
@@ -15,10 +15,10 @@
targetmob = M
if(usr.hud_used.inventory_shown && targetmob.hud_used)
- usr.hud_used.inventory_shown = 0
+ usr.hud_used.inventory_shown = FALSE
usr.client.screen -= targetmob.hud_used.toggleable_inventory
else
- usr.hud_used.inventory_shown = 1
+ usr.hud_used.inventory_shown = TRUE
usr.client.screen += targetmob.hud_used.toggleable_inventory
targetmob.hud_used.hidden_inventory_update(usr)
@@ -438,7 +438,7 @@
if(hud_used.hotkey_ui_hidden)
client.screen += hud_used.hotkeybuttons
- hud_used.hotkey_ui_hidden = 0
+ hud_used.hotkey_ui_hidden = FALSE
else
client.screen -= hud_used.hotkeybuttons
- hud_used.hotkey_ui_hidden = 1
+ hud_used.hotkey_ui_hidden = TRUE
diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index 8046dab41e..90f3380b81 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -42,7 +42,7 @@ SUBSYSTEM_DEF(mapping)
repopulate_sorted_areas()
process_teleport_locs() //Sets up the wizard teleport locations
preloadTemplates()
-
+#ifndef LOWMEMORYMODE
// Create space levels
for(var/I in 1 to ZLEVEL_SPACE_RUIN_COUNT)
add_new_zlevel("Empty Area [2 + I]", CROSSLINKED, list(ZTRAIT_SPACE_RUINS = TRUE))
@@ -67,7 +67,7 @@ SUBSYSTEM_DEF(mapping)
if (space_ruins.len)
seedRuins(space_ruins, CONFIG_GET(number/space_budget), /area/space, space_ruins_templates)
loading_ruins = FALSE
-
+#endif
repopulate_sorted_areas()
// Set up Z-level transitions.
setup_map_transitions()
diff --git a/code/datums/antagonists/brother.dm b/code/datums/antagonists/brother.dm
index e4c43ef788..fc690fd2bb 100644
--- a/code/datums/antagonists/brother.dm
+++ b/code/datums/antagonists/brother.dm
@@ -17,14 +17,15 @@
/datum/antagonist/brother/on_gain()
SSticker.mode.brothers += owner
- owner.objectives += team.objectives
+ objectives += team.objectives
+ owner.objectives += objectives
owner.special_role = special_role
finalize_brother()
return ..()
/datum/antagonist/brother/on_removal()
SSticker.mode.brothers -= owner
- owner.objectives -= team.objectives
+ owner.objectives -= objectives
if(owner.current)
to_chat(owner.current,"You are no longer the [special_role]!")
owner.special_role = null
diff --git a/code/game/alternate_appearance.dm b/code/game/alternate_appearance.dm
index 712b3425e0..1a62a0fd5f 100644
--- a/code/game/alternate_appearance.dm
+++ b/code/game/alternate_appearance.dm
@@ -124,3 +124,20 @@ GLOBAL_LIST_EMPTY(active_alternate_appearances)
/datum/atom_hud/alternate_appearance/basic/observers/mobShouldSee(mob/M)
return isobserver(M)
+
+/datum/atom_hud/alternate_appearance/basic/blessedAware
+
+/datum/atom_hud/alternate_appearance/basic/blessedAware/New()
+ ..()
+ for(var/mob in GLOB.mob_list)
+ if(mobShouldSee(mob))
+ add_hud_to(mob)
+
+/datum/atom_hud/alternate_appearance/basic/blessedAware/mobShouldSee(mob/M)
+ if(M.mind && (M.mind.assigned_role == "Chaplain"))
+ return TRUE
+ if (istype(M, /mob/living/simple_animal/hostile/construct/wraith))
+ return TRUE
+ if(isrevenant(M) || iseminence(M) || iswizard(M))
+ return TRUE
+ return FALSE
\ No newline at end of file
diff --git a/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm b/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm
index b53caee281..b3ac43a6c7 100644
--- a/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm
+++ b/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm
@@ -26,7 +26,7 @@
var/OldLoc = loc
if(NewLoc && !istype(NewLoc, /turf/open/indestructible/reebe_void))
var/turf/T = get_turf(NewLoc)
- if(T.flags_1 & NOJAUNT_1)
+ for(var/obj/effect/blessing/B in T)
if(last_failed_turf != T)
T.visible_message("[T] suddenly emits a ringing sound!", ignore_mob = src)
playsound(T, 'sound/machines/clockcult/ark_damage.ogg', 75, FALSE)
diff --git a/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm b/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm
index d66b16f209..d70be9c31c 100644
--- a/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm
+++ b/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm
@@ -88,10 +88,14 @@
set_security_level("delta")
for(var/V in SSticker.mode.servants_of_ratvar)
var/datum/mind/M = V
+ if(!M)
+ continue
if(ishuman(M.current))
M.current.add_overlay(mutable_appearance('icons/effects/genetics.dmi', "servitude", -MUTATIONS_LAYER))
for(var/V in GLOB.brass_recipes)
var/datum/stack_recipe/R = V
+ if(!R)
+ continue
if(R.title == "wall gear")
R.time *= 2 //Building walls becomes slower when the Ark activates
mass_recall()
@@ -123,6 +127,8 @@
/obj/structure/destructible/clockwork/massive/celestial_gateway/proc/mass_recall()
for(var/V in SSticker.mode.servants_of_ratvar)
var/datum/mind/M = V
+ if(!M)
+ continue
if(isliving(M.current) && M.current.stat != DEAD)
M.current.forceMove(get_turf(src))
M.current.overlay_fullscreen("flash", /obj/screen/fullscreen/flash)
@@ -262,7 +268,7 @@
return
if(!first_sound_played || prob(7))
for(var/mob/M in GLOB.player_list)
- if(M && !isnewplayer(M))
+ if(!isnewplayer(M))
var/turf/T = get_turf(M)
if(T && T.z == z)
to_chat(M, "You hear otherworldly sounds from the [dir2text(get_dir(get_turf(M), get_turf(src)))]...")
diff --git a/code/game/gamemodes/clock_cult/clock_structures/traps/brass_skewer.dm b/code/game/gamemodes/clock_cult/clock_structures/traps/brass_skewer.dm
index ea56aaa833..20a18d18f6 100644
--- a/code/game/gamemodes/clock_cult/clock_structures/traps/brass_skewer.dm
+++ b/code/game/gamemodes/clock_cult/clock_structures/traps/brass_skewer.dm
@@ -19,7 +19,7 @@
/obj/structure/destructible/clockwork/trap/brass_skewer/Destroy()
STOP_PROCESSING(SSfastprocess, src)
- if(buckled_mobs && buckled_mobs.len)
+ if(buckled_mobs && LAZYLEN(buckled_mobs))
var/mob/living/L = buckled_mobs[1]
if(iscarbon(L))
L.Knockdown(100)
@@ -30,18 +30,18 @@
/obj/structure/destructible/clockwork/trap/brass_skewer/process()
if(density)
- if(buckled_mobs.len)
+ if(buckled_mobs && LAZYLEN(buckled_mobs))
var/mob/living/spitroast = buckled_mobs[1]
spitroast.adjustBruteLoss(0.1)
/obj/structure/destructible/clockwork/trap/attackby(obj/item/I, mob/living/user, params)
- if(user in buckled_mobs)
+ if(buckled_mobs && (user in buckled_mobs))
to_chat(user, "You can't reach!")
return
..()
/obj/structure/destructible/clockwork/trap/brass_skewer/bullet_act(obj/item/projectile/P)
- if(buckled_mobs.len)
+ if(buckled_mobs && LAZYLEN(buckled_mobs))
var/mob/living/L = buckled_mobs[1]
return L.bullet_act(P)
return ..()
diff --git a/code/game/gamemodes/miniantags/revenant/revenant.dm b/code/game/gamemodes/miniantags/revenant/revenant.dm
index 0719072077..94775887f9 100644
--- a/code/game/gamemodes/miniantags/revenant/revenant.dm
+++ b/code/game/gamemodes/miniantags/revenant/revenant.dm
@@ -224,7 +224,6 @@
invisibility = INVISIBILITY_ABSTRACT
revealed = FALSE
ghostize(0)//Don't re-enter invisible corpse
- return
//reveal, stun, icon updates, cast checks, and essence changing
diff --git a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
index c401dfea52..5530db7881 100644
--- a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
+++ b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
@@ -238,9 +238,10 @@
INVOKE_ASYNC(src, .proc/defile, T)
/obj/effect/proc_holder/spell/aoe_turf/revenant/defile/proc/defile(turf/T)
- if(T.flags_1 & NOJAUNT_1)
- T.flags_1 &= ~NOJAUNT_1
+ for(var/obj/effect/blessing/B in T)
+ qdel(B)
new /obj/effect/temp_visual/revenant(T)
+
if(!isplatingturf(T) && !istype(T, /turf/open/floor/engine/cult) && isfloorturf(T) && prob(15))
var/turf/open/floor/floor = T
if(floor.intact && floor.floor_tile)
diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm
index 4c78ecca90..9fe7acd2cd 100644
--- a/code/game/gamemodes/revolution/revolution.dm
+++ b/code/game/gamemodes/revolution/revolution.dm
@@ -13,8 +13,8 @@
antag_flag = ROLE_REV
false_report_weight = 10
restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer")
- required_players = 20
- required_enemies = 1
+ required_players = 30
+ required_enemies = 2
recommended_enemies = 3
enemy_minimum_age = 14
diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm
index 62d203464c..53b1f88fb8 100644
--- a/code/game/machinery/dance_machine.dm
+++ b/code/game/machinery/dance_machine.dm
@@ -185,56 +185,56 @@
FOR_DVIEW(var/turf/t, 3, get_turf(src),INVISIBILITY_LIGHTING)
if(t.x == cen.x && t.y > cen.y)
var/obj/item/device/flashlight/spotlight/L = new /obj/item/device/flashlight/spotlight(t)
- L.light_color = "red"
+ L.light_color = LIGHT_COLOR_RED
L.light_power = 30-(get_dist(src,L)*8)
L.range = 1+get_dist(src, L)
spotlights+=L
continue
if(t.x == cen.x && t.y < cen.y)
var/obj/item/device/flashlight/spotlight/L = new /obj/item/device/flashlight/spotlight(t)
- L.light_color = "purple"
+ L.light_color = LIGHT_COLOR_PURPLE
L.light_power = 30-(get_dist(src,L)*8)
L.range = 1+get_dist(src, L)
spotlights+=L
continue
if(t.x > cen.x && t.y == cen.y)
var/obj/item/device/flashlight/spotlight/L = new /obj/item/device/flashlight/spotlight(t)
- L.light_color = "#ffff00"
+ L.light_color = LIGHT_COLOR_YELLOW
L.light_power = 30-(get_dist(src,L)*8)
L.range = 1+get_dist(src, L)
spotlights+=L
continue
if(t.x < cen.x && t.y == cen.y)
var/obj/item/device/flashlight/spotlight/L = new /obj/item/device/flashlight/spotlight(t)
- L.light_color = "green"
+ L.light_color = LIGHT_COLOR_GREEN
L.light_power = 30-(get_dist(src,L)*8)
L.range = 1+get_dist(src, L)
spotlights+=L
continue
if((t.x+1 == cen.x && t.y+1 == cen.y) || (t.x+2==cen.x && t.y+2 == cen.y))
var/obj/item/device/flashlight/spotlight/L = new /obj/item/device/flashlight/spotlight(t)
- L.light_color = "sw"
+ L.light_color = LIGHT_COLOR_ORANGE
L.light_power = 30-(get_dist(src,L)*8)
L.range = 1.4+get_dist(src, L)
spotlights+=L
continue
if((t.x-1 == cen.x && t.y-1 == cen.y) || (t.x-2==cen.x && t.y-2 == cen.y))
var/obj/item/device/flashlight/spotlight/L = new /obj/item/device/flashlight/spotlight(t)
- L.light_color = "ne"
+ L.light_color = LIGHT_COLOR_CYAN
L.light_power = 30-(get_dist(src,L)*8)
L.range = 1.4+get_dist(src, L)
spotlights+=L
continue
if((t.x-1 == cen.x && t.y+1 == cen.y) || (t.x-2==cen.x && t.y+2 == cen.y))
var/obj/item/device/flashlight/spotlight/L = new /obj/item/device/flashlight/spotlight(t)
- L.light_color = "se"
+ L.light_color = LIGHT_COLOR_BLUEGREEN
L.light_power = 30-(get_dist(src,L)*8)
L.range = 1.4+get_dist(src, L)
spotlights+=L
continue
if((t.x+1 == cen.x && t.y-1 == cen.y) || (t.x+2==cen.x && t.y-2 == cen.y))
var/obj/item/device/flashlight/spotlight/L = new /obj/item/device/flashlight/spotlight(t)
- L.light_color = "nw"
+ L.light_color = LIGHT_COLOR_BLUE
L.light_power = 30-(get_dist(src,L)*8)
L.range = 1.4+get_dist(src, L)
spotlights+=L
@@ -247,6 +247,8 @@
spawn_atom_to_turf(/obj/effect/temp_visual/hierophant/telegraph/edge, src, 1, FALSE)
sleep(5)
+#define DISCO_INFENO_RANGE (rand(85, 115)*0.01)
+
/obj/machinery/disco/proc/lights_spin()
for(var/i in 1 to 25)
if(QDELETED(src) || !active)
@@ -273,56 +275,57 @@
for(var/obj/item/device/flashlight/spotlight/glow in spotlights) // The multiples reflects custom adjustments to each colors after dozens of tests
if(QDELETED(src) || !active || QDELETED(glow))
return
- if(glow.light_color == "red")
- glow.light_color = "nw"
+ if(glow.light_color == LIGHT_COLOR_RED)
+ glow.light_color = LIGHT_COLOR_BLUE
glow.light_power = glow.light_power * 1.48
glow.light_range = 0
glow.update_light()
continue
- if(glow.light_color == "nw")
- glow.light_color = "green"
- glow.light_range = glow.range * 1.1
+ if(glow.light_color == LIGHT_COLOR_BLUE)
+ glow.light_color = LIGHT_COLOR_GREEN
+ glow.light_range = glow.range * DISCO_INFENO_RANGE
glow.light_power = glow.light_power * 2 // Any changes to power must come in pairs to neutralize it for other colors
glow.update_light()
continue
- if(glow.light_color == "green")
- glow.light_color = "sw"
+ if(glow.light_color == LIGHT_COLOR_GREEN)
+ glow.light_color = LIGHT_COLOR_ORANGE
glow.light_power = glow.light_power * 0.5
glow.light_range = 0
glow.update_light()
continue
- if(glow.light_color == "sw")
- glow.light_color = "purple"
+ if(glow.light_color == LIGHT_COLOR_ORANGE)
+ glow.light_color = LIGHT_COLOR_PURPLE
glow.light_power = glow.light_power * 2.27
- glow.light_range = glow.range * 1.15
+ glow.light_range = glow.range * DISCO_INFENO_RANGE
glow.update_light()
continue
- if(glow.light_color == "purple")
- glow.light_color = "se"
+ if(glow.light_color == LIGHT_COLOR_PURPLE)
+ glow.light_color = LIGHT_COLOR_BLUEGREEN
glow.light_power = glow.light_power * 0.44
glow.light_range = 0
glow.update_light()
continue
- if(glow.light_color == "se")
- glow.light_color = "#ffff00"
- glow.light_range = glow.range * 0.9
+ if(glow.light_color == LIGHT_COLOR_BLUEGREEN)
+ glow.light_color = LIGHT_COLOR_YELLOW
+ glow.light_range = glow.range * DISCO_INFENO_RANGE
glow.update_light()
continue
- if(glow.light_color == "#ffff00")
- glow.light_color = "ne"
+ if(glow.light_color == LIGHT_COLOR_YELLOW)
+ glow.light_color = LIGHT_COLOR_CYAN
glow.light_range = 0
glow.update_light()
continue
- if(glow.light_color == "ne")
- glow.light_color = "red"
+ if(glow.light_color == LIGHT_COLOR_CYAN)
+ glow.light_color = LIGHT_COLOR_RED
glow.light_power = glow.light_power * 0.68
- glow.light_range = glow.range * 0.85
+ glow.light_range = glow.range * DISCO_INFENO_RANGE
glow.update_light()
continue
if(prob(2)) // Unique effects for the dance floor that show up randomly to mix things up
INVOKE_ASYNC(src, .proc/hierofunk)
sleep(selection.song_beat)
+#undef DISCO_INFENO_RANGE
/obj/machinery/disco/proc/dance(var/mob/living/M) //Show your moves
set waitfor = FALSE
diff --git a/code/game/objects/effects/blessing.dm b/code/game/objects/effects/blessing.dm
new file mode 100644
index 0000000000..06ba2bb47c
--- /dev/null
+++ b/code/game/objects/effects/blessing.dm
@@ -0,0 +1,18 @@
+/obj/effect/blessing
+ name = "holy blessing"
+ desc = "Holy energies interfere with ethereal travel at this location."
+ icon = 'icons/effects/effects.dmi'
+ icon_state = null
+ anchored = TRUE
+ density = FALSE
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+
+/obj/effect/blessing/Initialize(mapload)
+ . = ..()
+ for(var/obj/effect/blessing/B in loc)
+ if(B != src)
+ return INITIALIZE_HINT_QDEL
+ var/image/I = image(icon = 'icons/effects/effects.dmi', icon_state = "blessed", layer = ABOVE_OPEN_TURF_LAYER, loc = src)
+ I.alpha = 64
+ I.appearance_flags = RESET_ALPHA
+ add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/blessedAware, "blessing", I)
diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm
index f5754029eb..5d3a345e8c 100644
--- a/code/game/objects/effects/effect_system/effects_foam.dm
+++ b/code/game/objects/effects/effect_system/effects_foam.dm
@@ -189,7 +189,7 @@
location = get_turf(loca)
amount = round(sqrt(amt / 2), 1)
- carry.copy_to(chemholder, 4*carry.total_volume) //The foam holds 4 times the total reagents volume for balance purposes.
+ carry.copy_to(chemholder, carry.total_volume, 4) //The foam holds 4 times the total reagents volume for balance purposes.
/datum/effect_system/foam_spread/metal/set_up(amt=5, loca, datum/reagents/carry = null, metaltype)
..()
diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm
index 4dc985c9a1..b0991461ec 100644
--- a/code/game/objects/effects/effect_system/effects_smoke.dm
+++ b/code/game/objects/effects/effect_system/effects_smoke.dm
@@ -271,7 +271,7 @@
else
location = get_turf(loca)
amount = radius
- carry.copy_to(chemholder, 4*carry.total_volume) //The smoke holds 4 times the total reagents volume for balance purposes.
+ carry.copy_to(chemholder, carry.total_volume, 4) //The smoke holds 4 times the total reagents volume for balance purposes.
if(!silent)
var/contained = ""
diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm
index 009bc211b4..b450e6750a 100644
--- a/code/game/objects/items/extinguisher.dm
+++ b/code/game/objects/items/extinguisher.dm
@@ -188,6 +188,6 @@
var/turf/T = get_turf(loc)
if(isopenturf(T))
var/turf/open/theturf = T
- theturf.MakeSlippery(min_wet_time = 10, wet_time_to_add = 5)
+ theturf.MakeSlippery(TURF_WET_WATER, min_wet_time = 10, wet_time_to_add = 5)
user.visible_message("[user] empties out \the [src] onto the floor using the release valve.", "You quietly empty out \the [src] using its release valve.")
diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm
index fb1a9c8787..c3bbc18d10 100644
--- a/code/game/objects/items/tools/screwdriver.dm
+++ b/code/game/objects/items/tools/screwdriver.dm
@@ -23,12 +23,12 @@
var/random_color = TRUE //if the screwdriver uses random coloring
var/static/list/screwdriver_colors = list(
"blue" = rgb(24, 97, 213),
- "red" = rgb(149, 23, 16),
+ "red" = rgb(255, 0, 0),
"pink" = rgb(213, 24, 141),
"brown" = rgb(160, 82, 18),
"green" = rgb(14, 127, 27),
"cyan" = rgb(24, 162, 213),
- "yellow" = rgb(213, 140, 24)
+ "yellow" = rgb(255, 165, 0)
)
/obj/item/screwdriver/suicide_act(mob/user)
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index c7595f3981..ea051ab16c 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -236,7 +236,7 @@
soundloop.stop()
if(isopenturf(loc))
var/turf/open/tile = loc
- tile.MakeSlippery(min_wet_time = 5, wet_time_to_add = 1)
+ tile.MakeSlippery(TURF_WET_WATER, min_wet_time = 5, wet_time_to_add = 1)
/obj/machinery/shower/attackby(obj/item/I, mob/user, params)
diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm
index b8d46977be..12b37d0e01 100644
--- a/code/game/turfs/open.dm
+++ b/code/game/turfs/open.dm
@@ -168,7 +168,7 @@
return 1
/turf/open/proc/water_vapor_gas_act()
- MakeSlippery(min_wet_time = 10, wet_time_to_add = 5)
+ MakeSlippery(TURF_WET_WATER, min_wet_time = 10, wet_time_to_add = 5)
for(var/mob/living/simple_animal/slime/M in src)
M.apply_water()
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 472df91354..c9d3e18743 100755
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -264,7 +264,7 @@
M.take_damage(damage*2, BRUTE, "melee", 1)
/turf/proc/Bless()
- flags_1 |= NOJAUNT_1
+ new /obj/effect/blessing(src)
/turf/storage_contents_dump_act(obj/item/storage/src_object, mob/user)
if(src_object.contents.len)
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 35aecbf6cb..5b756fd3d5 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -74,6 +74,8 @@
/datum/emote/living/carbon/human/wag/run_emote(mob/user, params)
. = ..()
+ if(!.)
+ return
var/mob/living/carbon/human/H = user
if(!H.is_wagging_tail())
H.startTailWag()
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 05cb67cdaa..987484bc8f 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -1623,24 +1623,29 @@ GLOBAL_LIST_EMPTY(roundstart_races)
var/loc_temp = H.get_temperature(environment)
- //Body temperature is adjusted in two steps. First, your body tries to stabilize itself a bit.
- if(H.stat != DEAD)
- H.natural_bodytemperature_stabilization()
-
- //Then, it reacts to the surrounding atmosphere based on your thermal protection
+ //Body temperature is adjusted in two parts: first there your body tries to naturally preserve homeostasis (shivering/sweating), then it reacts to the surrounding environment
+ //Thermal protection (insulation) has mixed benefits in two situations (hot in hot places, cold in hot places)
if(!H.on_fire) //If you're on fire, you do not heat up or cool down based on surrounding gases
- if(loc_temp < H.bodytemperature)
- //Place is colder than we are
- var/thermal_protection = H.get_cold_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to.
- if(thermal_protection < 1)
- H.bodytemperature += min((1-thermal_protection) * ((loc_temp - H.bodytemperature) / BODYTEMP_COLD_DIVISOR), BODYTEMP_COOLING_MAX)
- else
- //Place is hotter than we are
- var/thermal_protection = H.get_heat_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to.
- if(thermal_protection < 1)
- H.bodytemperature += min((1-thermal_protection) * ((loc_temp - H.bodytemperature) / BODYTEMP_HEAT_DIVISOR), BODYTEMP_HEATING_MAX)
+ if((abs(BODYTEMP_NORMAL - H.bodytemperature) <= 5) && (abs(BODYTEMP_NORMAL - loc_temp) <= 25))
+ return //Performance saver
+ var/natural = 0
+ if(H.stat != DEAD)
+ natural = H.natural_bodytemperature_stabilization()
+ var/thermal_protection = 1
+ if(loc_temp < H.bodytemperature) //Place is colder than we are
+ thermal_protection -= H.get_cold_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to.
+ if(H.bodytemperature < BODYTEMP_NORMAL) //we're cold, insulation helps us retain body heat and will reduce the heat we lose to the environment
+ H.bodytemperature += (thermal_protection+1)*natural + max(thermal_protection * (loc_temp - H.bodytemperature) / BODYTEMP_COLD_DIVISOR, BODYTEMP_COOLING_MAX)
+ else //we're sweating, insulation hinders our ability to reduce heat - and it will reduce the amount of cooling you get from the environment
+ H.bodytemperature += natural*(1/(thermal_protection+1)) + max((thermal_protection * (loc_temp - H.bodytemperature) + BODYTEMP_NORMAL - H.bodytemperature) / BODYTEMP_COLD_DIVISOR , BODYTEMP_COOLING_MAX) //Extra calculation for hardsuits to bleed off heat
+ else //Place is hotter than we are
+ thermal_protection -= H.get_heat_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to.
+ if(H.bodytemperature < BODYTEMP_NORMAL) //and we're cold, insulation enhances our ability to retain body heat but reduces the heat we get from the environment
+ H.bodytemperature += (thermal_protection+1)*natural + min(thermal_protection * (loc_temp - H.bodytemperature) / BODYTEMP_HEAT_DIVISOR, BODYTEMP_HEATING_MAX)
+ else //we're sweating, insulation hinders out ability to reduce heat - but will reduce the amount of heat we get from the environment
+ H.bodytemperature += natural*(1/(thermal_protection+1)) + min(thermal_protection * (loc_temp - H.bodytemperature) / BODYTEMP_HEAT_DIVISOR, BODYTEMP_HEATING_MAX)
- // +/- 50 degrees from 310.15K is the 'safe' zone, where no damage is dealt.
+ // +/- 50 degrees from 310K is the 'safe' zone, where no damage is dealt.
if(H.bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT && !(RESISTHOT in species_traits))
//Body temperature is too hot.
var/burn_damage
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 0ac97fba5a..1a610d97a6 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -396,15 +396,14 @@
/mob/living/carbon/proc/natural_bodytemperature_stabilization()
var/body_temperature_difference = BODYTEMP_NORMAL - bodytemperature
switch(bodytemperature)
- if(-INFINITY to BODYTEMP_COLD_DAMAGE_LIMIT) //BODYTEMP_COLD_DAMAGE_LIMIT is BODYTEMP_NORMAL(310.15) - 50, the temperature where you start to feel effects.
- bodytemperature += max((body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR), BODYTEMP_AUTORECOVERY_MINIMUM)
+ if(-INFINITY to BODYTEMP_COLD_DAMAGE_LIMIT) //Cold damage limit is 50 below the default, the temperature where you start to feel effects.
+ return max((body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR), BODYTEMP_AUTORECOVERY_MINIMUM)
if(BODYTEMP_COLD_DAMAGE_LIMIT to BODYTEMP_NORMAL)
- bodytemperature += max(body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR, min(body_temperature_difference, BODYTEMP_AUTORECOVERY_MINIMUM/4))
- if(BODYTEMP_NORMAL to BODYTEMP_HEAT_DAMAGE_LIMIT)
- bodytemperature += min(body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR, max(body_temperature_difference, -BODYTEMP_AUTORECOVERY_MINIMUM/4))
- if(BODYTEMP_HEAT_DAMAGE_LIMIT to INFINITY) //BODYTEMP_HEAT_DAMAGE_LIMIT is BODYTEMP_NORMAL(310.15) + 50, the temperature where you start to feel effects.
- //We totally need a sweat system cause it totally makes sense...~
- bodytemperature += min((body_temperature_difference / BODYTEMP_AUTORECOVERY_DIVISOR), -BODYTEMP_AUTORECOVERY_MINIMUM) //We're dealing with negative numbers
+ return max(body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR, min(body_temperature_difference, BODYTEMP_AUTORECOVERY_MINIMUM/4))
+ if(BODYTEMP_NORMAL to BODYTEMP_HEAT_DAMAGE_LIMIT) // Heat damage limit is 50 above the default, the temperature where you start to feel effects.
+ return min(body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR, max(body_temperature_difference, -BODYTEMP_AUTORECOVERY_MINIMUM/4))
+ if(BODYTEMP_HEAT_DAMAGE_LIMIT to INFINITY)
+ return min((body_temperature_difference / BODYTEMP_AUTORECOVERY_DIVISOR), -BODYTEMP_AUTORECOVERY_MINIMUM) //We're dealing with negative numbers
/////////
//LIVER//
/////////
@@ -460,4 +459,4 @@
death()
var/obj/item/organ/brain/B = getorganslot(ORGAN_SLOT_BRAIN)
if(B)
- B.damaged_brain = TRUE
+ B.damaged_brain = TRUE
diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm
index b451a2b591..b6609a319e 100644
--- a/code/modules/mob/living/carbon/monkey/life.dm
+++ b/code/modules/mob/living/carbon/monkey/life.dm
@@ -66,7 +66,7 @@
var/loc_temp = get_temperature(environment)
if(stat != DEAD)
- natural_bodytemperature_stabilization()
+ bodytemperature += natural_bodytemperature_stabilization()
if(!on_fire) //If you're on fire, you do not heat up or cool down based on surrounding gases
if(loc_temp < bodytemperature)
diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
index b9276116d5..6ed80afbb7 100644
--- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
@@ -247,7 +247,7 @@
if(prob(75))
var/turf/open/T = loc
if(istype(T))
- T.MakeSlippery(min_wet_time = 20, wet_time_to_add = 15)
+ T.MakeSlippery(TURF_WET_WATER, min_wet_time = 20, wet_time_to_add = 15)
else
visible_message("[src] whirs and bubbles violently, before releasing a plume of froth!")
new /obj/effect/particle_effect/foam(loc)
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 634c1ebb5f..371f19f033 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -231,7 +231,7 @@
var/atom/A = src.loc
if(isturf(A))
var/areatemp = get_temperature(environment)
- if( abs(areatemp - bodytemperature) > 40 )
+ if( abs(areatemp - bodytemperature) > 5)
var/diff = areatemp - bodytemperature
diff = diff / 5
bodytemperature += diff
diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm
index 6cc1df085c..c4288cbfae 100644
--- a/code/modules/mob/living/simple_animal/slime/life.dm
+++ b/code/modules/mob/living/simple_animal/slime/life.dm
@@ -339,6 +339,14 @@
if(L in Friends) // No eating friends!
continue
+ var/ally = FALSE
+ for(var/F in faction)
+ if(F in L.faction)
+ ally = TRUE
+ break
+ if(ally)
+ continue
+
if(issilicon(L) && (rabid || attacked)) // They can't eat silicons, but they can glomp them in defence
targets += L // Possible target found!
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 4a7278289c..0b770888ec 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -212,9 +212,13 @@
R.stun(20)
return
if(stepTurf.flags_1 & NOJAUNT_1)
- to_chat(L, "Holy energies block your path.")
- else
- L.loc = get_step(L, direct)
+ to_chat(L, "Some strange aura is blocking the way.")
+ return
+ if (locate(/obj/effect/blessing, stepTurf))
+ to_chat(L, "Holy energies block your path!")
+ return
+
+ L.loc = get_step(L, direct)
L.setDir(direct)
return TRUE
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index f83a4f41d8..22e78298b8 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -492,7 +492,7 @@
// if a light is turned off, it won't activate emergency power
/obj/machinery/light/proc/turned_off()
var/area/A = get_area(src)
- return !A.lightswitch && A.power_light || !flickering
+ return !A.lightswitch && A.power_light || flickering
// returns whether this light has power
// true if area has power and lightswitch is on
diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm
index 08a087dbac..6080763548 100644
--- a/code/modules/reagents/chemistry/holder.dm
+++ b/code/modules/reagents/chemistry/holder.dm
@@ -158,7 +158,7 @@
if(istype(target, /datum/reagents))
R = target
else
- if(!target.reagents || src.total_volume<=0)
+ if(!target.reagents)
return
R = target.reagents
amount = min(min(amount, src.total_volume), R.maximum_volume-R.total_volume)
@@ -181,14 +181,14 @@
/datum/reagents/proc/copy_to(obj/target, amount=1, multiplier=1, preserve_data=1)
var/list/cached_reagents = reagent_list
- if(!target)
+ if(!target || !total_volume)
return
var/datum/reagents/R
if(istype(target, /datum/reagents))
R = target
else
- if(!target.reagents || src.total_volume<=0)
+ if(!target.reagents)
return
R = target.reagents
diff --git a/code/modules/reagents/chemistry/reagents/blob_reagents.dm b/code/modules/reagents/chemistry/reagents/blob_reagents.dm
index de96631bc9..cd5f4aa7c7 100644
--- a/code/modules/reagents/chemistry/reagents/blob_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/blob_reagents.dm
@@ -459,7 +459,7 @@
reac_volume = ..()
var/turf/open/T = get_turf(M)
if(istype(T) && prob(reac_volume))
- T.MakeSlippery(min_wet_time = 10, wet_time_to_add = 5)
+ T.MakeSlippery(TURF_WET_WATER, min_wet_time = 10, wet_time_to_add = 5)
M.adjust_fire_stacks(-(reac_volume / 10))
M.ExtinguishMob()
M.apply_damage(0.4*reac_volume, BRUTE)
@@ -481,7 +481,7 @@
/datum/reagent/blob/pressurized_slime/proc/extinguisharea(obj/structure/blob/B, probchance)
for(var/turf/open/T in range(1, B))
if(prob(probchance))
- T.MakeSlippery(min_wet_time = 10, wet_time_to_add = 5)
+ T.MakeSlippery(TURF_WET_WATER, min_wet_time = 10, wet_time_to_add = 5)
for(var/obj/O in T)
O.extinguish()
for(var/mob/living/L in T)
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index 835bcaaad7..a25d8938b6 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -124,7 +124,7 @@
if(!istype(T))
return
if(reac_volume >= 5)
- T.MakeSlippery(min_wet_time = 10, wet_time_to_add = reac_volume * 1.5)
+ T.MakeSlippery(TURF_WET_LUBE, min_wet_time = 10, wet_time_to_add = reac_volume * 1.5)
T.name = "deep-fried [initial(T.name)]"
T.add_atom_colour(color, TEMPORARY_COLOUR_PRIORITY)
@@ -213,29 +213,31 @@
taste_description = "mint"
/datum/reagent/consumable/frostoil/on_mob_life(mob/living/M)
- switch(current_cycle)
- if(1 to 15)
- M.bodytemperature -= 10 * TEMPERATURE_DAMAGE_COEFFICIENT
- if(holder.has_reagent("capsaicin"))
- holder.remove_reagent("capsaicin", 5)
- if(isslime(M))
- M.bodytemperature -= rand(5,20)
- if(15 to 25)
- M.bodytemperature -= 20 * TEMPERATURE_DAMAGE_COEFFICIENT
- if(isslime(M))
- M.bodytemperature -= rand(10,20)
- if(25 to 35)
- M.bodytemperature -= 30 * TEMPERATURE_DAMAGE_COEFFICIENT
- if(prob(1))
- M.emote("shiver")
- if(isslime(M))
- M.bodytemperature -= rand(15,20)
- if(35 to INFINITY)
- M.bodytemperature -= 40 * TEMPERATURE_DAMAGE_COEFFICIENT
- if(prob(5))
- M.emote("shiver")
- if(isslime(M))
- M.bodytemperature -= rand(20,25)
+ if(M.bodytemperature > 50)
+ switch(current_cycle)
+ if(1 to 15)
+ M.bodytemperature -= 10 * TEMPERATURE_DAMAGE_COEFFICIENT
+ if(holder.has_reagent("capsaicin"))
+ holder.remove_reagent("capsaicin", 5)
+ if(isslime(M))
+ M.bodytemperature -= rand(5,20)
+ if(15 to 25)
+ M.bodytemperature -= 20 * TEMPERATURE_DAMAGE_COEFFICIENT
+ if(isslime(M))
+ M.bodytemperature -= rand(10,20)
+ if(25 to 35)
+ M.bodytemperature -= 30 * TEMPERATURE_DAMAGE_COEFFICIENT
+ if(prob(1))
+ M.emote("shiver")
+ if(isslime(M))
+ M.bodytemperature -= rand(15,20)
+ if(35 to INFINITY)
+ M.bodytemperature -= 40 * TEMPERATURE_DAMAGE_COEFFICIENT
+ if(prob(5))
+ M.emote("shiver")
+ if(isslime(M))
+ M.bodytemperature -= rand(20,25)
+ M.bodytemperature = max(50, M.bodytemperature)
..()
/datum/reagent/consumable/frostoil/reaction_turf(turf/T, reac_volume)
@@ -430,7 +432,7 @@
/datum/reagent/consumable/cornoil/reaction_turf(turf/open/T, reac_volume)
if (!istype(T))
return
- T.MakeSlippery(min_wet_time = 10, wet_time_to_add = reac_volume*2)
+ T.MakeSlippery(TURF_WET_LUBE, min_wet_time = 10, wet_time_to_add = reac_volume*2)
var/obj/effect/hotspot/hotspot = (locate(/obj/effect/hotspot) in T)
if(hotspot)
var/datum/gas_mixture/lowertemp = T.remove_air(T.air.total_moles())
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index dd740b0c68..634136bfaf 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -130,7 +130,7 @@
var/CT = cooling_temperature
if(reac_volume >= 5)
- T.MakeSlippery(min_wet_time = 10, wet_time_to_add = min(reac_volume*1.5, 60))
+ T.MakeSlippery(TURF_WET_WATER, min_wet_time = 10, wet_time_to_add = min(reac_volume*1.5, 60))
for(var/mob/living/simple_animal/slime/M in T)
M.apply_water()
@@ -614,11 +614,13 @@
/datum/reagent/oxygen/reaction_obj(obj/O, reac_volume)
if((!O) || (!reac_volume))
return 0
- O.atmos_spawn_air("o2=[reac_volume/2];TEMP=[T20C]")
+ var/temp = holder ? holder.chem_temp : T20C
+ O.atmos_spawn_air("o2=[reac_volume/2];TEMP=[temp]")
/datum/reagent/oxygen/reaction_turf(turf/open/T, reac_volume)
if(istype(T))
- T.atmos_spawn_air("o2=[reac_volume/2];TEMP=[T20C]")
+ var/temp = holder ? holder.chem_temp : T20C
+ T.atmos_spawn_air("o2=[reac_volume/2];TEMP=[temp]")
return
/datum/reagent/copper
@@ -640,11 +642,13 @@
/datum/reagent/nitrogen/reaction_obj(obj/O, reac_volume)
if((!O) || (!reac_volume))
return 0
- O.atmos_spawn_air("n2=[reac_volume/2];TEMP=[T20C]")
+ var/temp = holder ? holder.chem_temp : T20C
+ O.atmos_spawn_air("n2=[reac_volume/2];TEMP=[temp]")
/datum/reagent/nitrogen/reaction_turf(turf/open/T, reac_volume)
if(istype(T))
- T.atmos_spawn_air("n2=[reac_volume/2];TEMP=[T20C]")
+ var/temp = holder ? holder.chem_temp : T20C
+ T.atmos_spawn_air("n2=[reac_volume/2];TEMP=[temp]")
return
/datum/reagent/hydrogen
@@ -1119,11 +1123,13 @@
/datum/reagent/carbondioxide/reaction_obj(obj/O, reac_volume)
if((!O) || (!reac_volume))
return 0
- O.atmos_spawn_air("co2=[reac_volume/5];TEMP=[T20C]")
+ var/temp = holder ? holder.chem_temp : T20C
+ O.atmos_spawn_air("co2=[reac_volume/5];TEMP=[temp]")
/datum/reagent/carbondioxide/reaction_turf(turf/open/T, reac_volume)
if(istype(T))
- T.atmos_spawn_air("co2=[reac_volume/5];TEMP=[T20C]")
+ var/temp = holder ? holder.chem_temp : T20C
+ T.atmos_spawn_air("co2=[reac_volume/5];TEMP=[temp]")
return
/datum/reagent/nitrous_oxide
@@ -1138,11 +1144,13 @@
/datum/reagent/nitrous_oxide/reaction_obj(obj/O, reac_volume)
if((!O) || (!reac_volume))
return 0
- O.atmos_spawn_air("n2o=[reac_volume/5];TEMP=[T20C]")
+ var/temp = holder ? holder.chem_temp : T20C
+ O.atmos_spawn_air("n2o=[reac_volume/5];TEMP=[temp]")
/datum/reagent/nitrous_oxide/reaction_turf(turf/open/T, reac_volume)
if(istype(T))
- T.atmos_spawn_air("n2o=[reac_volume/5];TEMP=[T20C]")
+ var/temp = holder ? holder.chem_temp : T20C
+ T.atmos_spawn_air("n2o=[reac_volume/5];TEMP=[temp]")
/datum/reagent/nitrous_oxide/reaction_mob(mob/M, method=TOUCH, reac_volume)
if(method == VAPOR)
diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
index 526a2602b6..7f4e481a29 100644
--- a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
@@ -187,7 +187,7 @@
/datum/reagent/cryostylane/on_mob_life(mob/living/M) //TODO: code freezing into an ice cube
if(M.reagents.has_reagent("oxygen"))
M.reagents.remove_reagent("oxygen", 0.5)
- M.bodytemperature -= 15
+ M.bodytemperature = max(M.bodytemperature - 15,0)
..()
/datum/reagent/cryostylane/reaction_turf(turf/T, reac_volume)
diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
index 6e1e8046fe..fa996b0bc0 100644
--- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
@@ -73,11 +73,13 @@
/datum/reagent/toxin/plasma/reaction_obj(obj/O, reac_volume)
if((!O) || (!reac_volume))
return 0
- O.atmos_spawn_air("plasma=[reac_volume];TEMP=[T20C]")
+ var/temp = holder ? holder.chem_temp : T20C
+ O.atmos_spawn_air("plasma=[reac_volume];TEMP=[temp]")
/datum/reagent/toxin/plasma/reaction_turf(turf/open/T, reac_volume)
if(istype(T))
- T.atmos_spawn_air("plasma=[reac_volume];TEMP=[T20C]")
+ var/temp = holder ? holder.chem_temp : T20C
+ T.atmos_spawn_air("plasma=[reac_volume];TEMP=[temp]")
return
/datum/reagent/toxin/plasma/reaction_mob(mob/living/M, method=TOUCH, reac_volume)//Splashing people with plasma is stronger than fuel!
diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
index b77dcc435a..9f11498ee5 100644
--- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
+++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
@@ -346,15 +346,17 @@
id = "cryostylane_oxygen"
results = list("cryostylane" = 1)
required_reagents = list("cryostylane" = 1, "oxygen" = 1)
+ mob_react = FALSE
/datum/chemical_reaction/cryostylane_oxygen/on_reaction(datum/reagents/holder, created_volume)
- holder.chem_temp -= 10*created_volume
+ holder.chem_temp = max(holder.chem_temp - 10*created_volume,0)
/datum/chemical_reaction/pyrosium_oxygen
name = "ephemeral pyrosium reaction"
id = "pyrosium_oxygen"
results = list("pyrosium" = 1)
required_reagents = list("pyrosium" = 1, "oxygen" = 1)
+ mob_react = FALSE
/datum/chemical_reaction/pyrosium_oxygen/on_reaction(datum/reagents/holder, created_volume)
holder.chem_temp += 10*created_volume
diff --git a/code/modules/spells/spell_types/ethereal_jaunt.dm b/code/modules/spells/spell_types/ethereal_jaunt.dm
index 79d53d5f49..e438966f45 100644
--- a/code/modules/spells/spell_types/ethereal_jaunt.dm
+++ b/code/modules/spells/spell_types/ethereal_jaunt.dm
@@ -85,12 +85,18 @@
return
var/turf/newLoc = get_step(src,direction)
setDir(direction)
- if(!(newLoc.flags_1 & NOJAUNT_1))
- forceMove(newLoc)
- else
- to_chat(user, "Some strange aura is blocking the way!")
+
movedelay = world.time + movespeed
+ if(newLoc.flags_1 & NOJAUNT_1)
+ to_chat(user, "Some strange aura is blocking the way.")
+ return
+ if (locate(/obj/effect/blessing, newLoc))
+ to_chat(user, "Holy energies block your path!")
+ return
+
+ forceMove(newLoc)
+
/obj/effect/dummy/spell_jaunt/ex_act(blah)
return
/obj/effect/dummy/spell_jaunt/bullet_act(blah)
diff --git a/html/changelogs/AutoChangeLog-pr-4929.yml b/html/changelogs/AutoChangeLog-pr-4929.yml
new file mode 100644
index 0000000000..2f78ca8c6a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4929.yml
@@ -0,0 +1,6 @@
+author: "Robustin"
+delete-after: True
+changes:
+ - bugfix: "Fixed frost oil (cryosting) sending insulated crewmembers below absolute zero temperatures."
+ - bugfix: "Fixed damaging cold temps being a death sentence to simple mobs (they wouldn't heat back up to safe temps at room temperature)."
+ - refactor: "Refactored human temperature code, insulating clothing now helps you stay warm but going unprotected will help you cool off. However, you will now benefit from colder temps when you're overheating even in full EVA/hardsuit gear and you will warm up faster at room temperature in insulated gear as well (i.e. putting on a winter coat will no longer suppress your temperature if your already cold)."
diff --git a/html/changelogs/AutoChangeLog-pr-4954.yml b/html/changelogs/AutoChangeLog-pr-4954.yml
new file mode 100644
index 0000000000..fe18bb3685
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4954.yml
@@ -0,0 +1,4 @@
+author: "XDTM"
+delete-after: True
+changes:
+ - bugfix: "Slimes no longer attack people with their same faction."
diff --git a/html/changelogs/AutoChangeLog-pr-4978.yml b/html/changelogs/AutoChangeLog-pr-4978.yml
new file mode 100644
index 0000000000..5aac9860ca
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4978.yml
@@ -0,0 +1,4 @@
+author: "WJohnston"
+delete-after: True
+changes:
+ - imageadd: "Wirecutter greyscaling is now less ugly"
diff --git a/html/changelogs/AutoChangeLog-pr-4984.yml b/html/changelogs/AutoChangeLog-pr-4984.yml
new file mode 100644
index 0000000000..7bcdcd1d76
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4984.yml
@@ -0,0 +1,9 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - balance: "foam and smoke now get 4x the reagents as they should according to the comments"
+ - bugfix: "fixes pyrosium and cryostylane not heating or cooling humans at all"
+ - bugfix: "fixes cryostylane cooling beakers to negative kelvin, it's now limited to what the description says"
+ - bugfix: "fixes cryostylane cooling people to negative body temperature"
+ - code_imp: "removed redundant check in trans_to"
+ - code_imp: "fixes a runtime when total_volume is 0 in copy_to"
diff --git a/html/changelogs/AutoChangeLog-pr-4985.yml b/html/changelogs/AutoChangeLog-pr-4985.yml
new file mode 100644
index 0000000000..fc731138f9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4985.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - tweak: "Gas reagents (o2, plasma, ...) now dump out gas based on container temperature instead of room temperature"
diff --git a/html/changelogs/AutoChangeLog-pr-4986.yml b/html/changelogs/AutoChangeLog-pr-4986.yml
new file mode 100644
index 0000000000..05c15b0984
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4986.yml
@@ -0,0 +1,4 @@
+author: "Dax Dupont & Coiax"
+delete-after: True
+changes:
+ - rscadd: "Praise the lord for he has granted thy chaplains, wizards, revenants and eminences with holy vision. They can now see blessed tiles."
diff --git a/html/changelogs/AutoChangeLog-pr-4988.yml b/html/changelogs/AutoChangeLog-pr-4988.yml
new file mode 100644
index 0000000000..373705280e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4988.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Bananium shows up on mining scanners again"
diff --git a/html/changelogs/AutoChangeLog-pr-4992.yml b/html/changelogs/AutoChangeLog-pr-4992.yml
new file mode 100644
index 0000000000..84d5717ecd
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4992.yml
@@ -0,0 +1,4 @@
+author: "Xhuis"
+delete-after: True
+changes:
+ - bugfix: "Emergency lights now function correctly."
diff --git a/html/changelogs/AutoChangeLog-pr-4993.yml b/html/changelogs/AutoChangeLog-pr-4993.yml
new file mode 100644
index 0000000000..5366599d25
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4993.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - tweak: "min player req for rev is 30 now"
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index 3451915c09..c05ac6d022 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/effects/ore_visuals.dmi b/icons/effects/ore_visuals.dmi
index 30a05b043a..1353a2d814 100644
Binary files a/icons/effects/ore_visuals.dmi and b/icons/effects/ore_visuals.dmi differ
diff --git a/icons/mob/inhands/weapons/swords_lefthand.dmi b/icons/mob/inhands/weapons/swords_lefthand.dmi
index 802b9b85f1..231a98f537 100644
Binary files a/icons/mob/inhands/weapons/swords_lefthand.dmi and b/icons/mob/inhands/weapons/swords_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/swords_righthand.dmi b/icons/mob/inhands/weapons/swords_righthand.dmi
index 60b2a3fbad..6b491b05ee 100644
Binary files a/icons/mob/inhands/weapons/swords_righthand.dmi and b/icons/mob/inhands/weapons/swords_righthand.dmi differ
diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi
index 446b093167..87f63a8353 100644
Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ
diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi
index b02c369814..7fa7bec604 100644
Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index 48f6d1694a..7ca53cfc2c 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -13,7 +13,7 @@
// END_PREFERENCES
// BEGIN_INCLUDE
-#include "_maps\basemap.dm"
+#include "_maps\_basemap.dm"
#include "code\_compile_options.dm"
#include "code\world.dm"
#include "code\__DATASTRUCTURES\globals.dm"
@@ -820,6 +820,7 @@
#include "code\game\objects\structures.dm"
#include "code\game\objects\effects\alien_acid.dm"
#include "code\game\objects\effects\anomalies.dm"
+#include "code\game\objects\effects\blessing.dm"
#include "code\game\objects\effects\bump_teleporter.dm"
#include "code\game\objects\effects\contraband.dm"
#include "code\game\objects\effects\countdown.dm"
diff --git a/tgui/reload.bat b/tgui/reload.bat
index c59d502f36..d45411f006 100644
--- a/tgui/reload.bat
+++ b/tgui/reload.bat
@@ -4,5 +4,5 @@ REM Get the documents folder from the registry.
for /f "tokens=3*" %%p in ('REG QUERY "HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" /v Personal') do (
set DocumentsFolder=%%p
)
-REM Copy assets to the BYOND cache
-cmd /c copy assets\* "%DocumentsFolder%\BYOND\cache" /y
+REM Copy to tmp subdirectories
+FOR /D %%G in ("%DocumentsFolder%\BYOND\cache\tmp*") DO (cmd /c copy assets\* %%G /y)
\ No newline at end of file