Merge remote-tracking branch 'origin/master' into fixes-2

This commit is contained in:
LetterN
2021-03-22 09:32:21 +08:00
68 changed files with 4163 additions and 3914 deletions
+1 -1
View File
@@ -20,7 +20,7 @@ jobs:
run: |
~/dmdoc
touch dmdoc/.nojekyll
echo codedocs.tgstation13.org > dmdoc/CNAME
echo codedocs.citadel-station.net > dmdoc/CNAME
- name: Deploy
uses: JamesIves/github-pages-deploy-action@3.7.1
with:
@@ -158,8 +158,8 @@
/area/ruin/powered/beach)
"aF" = (
/obj/machinery/vending/boozeomat{
set_obj_flags = "EMAGGED";
req_access_txt = "0"
req_access_txt = "0";
set_obj_flags = "EMAGGED"
},
/turf/open/floor/wood,
/area/ruin/powered/beach)
@@ -547,8 +547,8 @@
"rV" = (
/obj/effect/turf_decal/sand,
/obj/item/reagent_containers/food/drinks/beer/light{
pixel_y = -3;
pixel_x = -9
pixel_x = -9;
pixel_y = -3
},
/turf/open/floor/plating,
/area/ruin/powered/beach)
@@ -326,8 +326,8 @@
/area/ruin/unpowered/ash_walkers)
"aO" = (
/obj/structure/stone_tile/surrounding/cracked{
icon_state = "cracked_surrounding1";
dir = 1
dir = 1;
icon_state = "cracked_surrounding1"
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
@@ -510,9 +510,7 @@
/obj/structure/stone_tile/cracked{
dir = 4
},
/obj/item/construction/rcd/loaded/upgraded{
},
/obj/item/construction/rcd/loaded/upgraded,
/turf/open/indestructible/boss,
/area/ruin/unpowered/ash_walkers)
"bn" = (
@@ -1019,8 +1017,8 @@
/area/ruin/unpowered/ash_walkers)
"cA" = (
/obj/structure/stone_tile/slab/cracked{
icon_state = "cracked_slab1";
dir = 4
dir = 4;
icon_state = "cracked_slab1"
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
@@ -13,10 +13,10 @@
/area/ruin/unpowered)
"f" = (
/obj/structure/mirror{
broken = 1;
desc = "This mirror has been shattered. It looks like the bad luck energies spilling from it are taking immediate effect on your surroundings!";
icon_state = "mirror_broke";
pixel_x = -28;
broken = 1
pixel_x = -28
},
/obj/item/clothing/suit/hooded/bloated_human,
/obj/effect/decal/cleanable/blood,
@@ -25,10 +25,10 @@
"g" = (
/obj/effect/decal/cleanable/blood/tracks,
/obj/structure/mirror{
broken = 1;
desc = "This mirror has been shattered. It looks like the bad luck energies spilling from it are taking immediate effect on your surroundings!";
icon_state = "mirror_broke";
pixel_x = -28;
broken = 1
pixel_x = -28
},
/turf/open/floor/plating,
/area/ruin/unpowered)
@@ -45,10 +45,10 @@
/area/ruin/unpowered)
"k" = (
/obj/structure/mirror{
broken = 1;
desc = "This mirror has been shattered. It looks like the bad luck energies spilling from it are taking immediate effect on your surroundings!";
icon_state = "mirror_broke";
pixel_x = 28;
broken = 1
pixel_x = 28
},
/turf/open/floor/plating{
icon_state = "panelscorched"
@@ -56,19 +56,19 @@
/area/ruin/unpowered)
"l" = (
/obj/structure/mirror{
broken = 1;
desc = "This mirror has been shattered. It looks like the bad luck energies spilling from it are taking immediate effect on your surroundings!";
icon_state = "mirror_broke";
pixel_x = 28;
broken = 1
pixel_x = 28
},
/turf/open/floor/plating,
/area/ruin/unpowered)
"m" = (
/obj/structure/mirror{
broken = 1;
desc = "This mirror has been shattered. It looks like the bad luck energies spilling from it are taking immediate effect on your surroundings!";
icon_state = "mirror_broke";
pixel_x = -28;
broken = 1
pixel_x = -28
},
/turf/open/floor/plating,
/area/ruin/unpowered)
@@ -79,10 +79,10 @@
/area/ruin/unpowered)
"o" = (
/obj/structure/mirror{
broken = 1;
desc = "This mirror has been shattered. It looks like the bad luck energies spilling from it are taking immediate effect on your surroundings!";
icon_state = "mirror_broke";
pixel_x = -28;
broken = 1
pixel_x = -28
},
/turf/open/floor/plating{
icon_state = "platingdmg1"
@@ -98,10 +98,10 @@
/area/lavaland/surface/outdoors)
"T" = (
/obj/structure/mirror{
broken = 1;
desc = "This mirror has been shattered. It looks like the bad luck energies spilling from it are taking immediate effect on your surroundings!";
icon_state = "mirror_broke";
pixel_y = 28;
broken = 1
pixel_y = 28
},
/obj/item/kitchen/knife/envy,
/turf/open/floor/plating,
@@ -137,8 +137,8 @@
/area/ruin/powered)
"D" = (
/obj/effect/decal/cleanable/blood/footprints{
icon_state = "blood1";
dir = 1
dir = 1;
icon_state = "blood1"
},
/obj/machinery/door/airlock/survival_pod/glass,
/obj/structure/fans/tiny,
@@ -641,4 +641,4 @@ a
a
a
a
"}
"}
@@ -87,8 +87,8 @@
/obj/effect/decal/cleanable/blood,
/obj/effect/decal/cleanable/blood/drip,
/obj/effect/decal/cleanable/blood/footprints{
icon_state = "blood1";
dir = 1
dir = 1;
icon_state = "blood1"
},
/turf/open/floor/pod/dark,
/area/ruin/powered)
@@ -106,24 +106,24 @@
/area/lavaland/surface/outdoors)
"t" = (
/obj/effect/decal/cleanable/blood/footprints{
icon_state = "blood1";
dir = 1
dir = 1;
icon_state = "blood1"
},
/obj/machinery/door/airlock/survival_pod/glass,
/turf/open/floor/pod/dark,
/area/ruin/powered)
"u" = (
/obj/effect/decal/cleanable/blood/footprints{
icon_state = "blood1";
dir = 8
dir = 8;
icon_state = "blood1"
},
/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"v" = (
/obj/effect/decal/cleanable/blood/footprints{
icon_state = "blood1";
dir = 8
dir = 8;
icon_state = "blood1"
},
/obj/effect/decal/cleanable/blood/footprints{
icon_state = "blood1"
@@ -139,8 +139,8 @@
"x" = (
/obj/effect/decal/cleanable/blood/drip,
/obj/effect/decal/cleanable/blood/footprints{
icon_state = "blood1";
dir = 1
dir = 1;
icon_state = "blood1"
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
@@ -149,15 +149,15 @@
pixel_y = 32
},
/obj/effect/decal/cleanable/blood/footprints{
icon_state = "blood1";
dir = 8
dir = 8;
icon_state = "blood1"
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"z" = (
/obj/effect/decal/cleanable/blood/footprints{
icon_state = "blood1";
dir = 8
dir = 8;
icon_state = "blood1"
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
+2 -2
View File
@@ -2268,9 +2268,9 @@
"hF" = (
/obj/structure/table,
/obj/machinery/computer/pod/old{
id = "derelict_gun";
name = "ProComp IIe";
pixel_y = 7;
id = "derelict_gun"
pixel_y = 7
},
/turf/open/floor/plasteel/chapel,
/area/ruin/space/derelict/medical/chapel)
+12 -12
View File
@@ -66,8 +66,8 @@
/area/ruin/space/has_grav/powered/advancedlab)
"n" = (
/obj/structure/chair/comfy/beige{
icon_state = "comfychair";
dir = 8
dir = 8;
icon_state = "comfychair"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/powered/advancedlab)
@@ -85,10 +85,10 @@
},
/obj/structure/table/glass,
/obj/item/paper{
info = "As of yet, our experiments have seen a fair bit of success. Unfortunately, our business partners have stopped funding us as they realised they utterly hate each other. To whoever finds this place, they are yours. Use them how you will. I leave you with the next generation of greytiding.";
name = "Note to finder";
pixel_x = -1;
pixel_y = 3;
info = "As of yet, our experiments have seen a fair bit of success. Unfortunately, our business partners have stopped funding us as they realised they utterly hate each other. To whoever finds this place, they are yours. Use them how you will. I leave you with the next generation of greytiding."
pixel_y = 3
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/powered/advancedlab)
@@ -112,8 +112,8 @@
/area/ruin/space/has_grav/powered/advancedlab)
"s" = (
/obj/structure/chair/comfy/beige{
icon_state = "comfychair";
dir = 1
dir = 1;
icon_state = "comfychair"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/powered/advancedlab)
@@ -123,8 +123,8 @@
/area/ruin/space/has_grav/powered/advancedlab)
"u" = (
/obj/machinery/light/small{
icon_state = "bulb";
dir = 4
dir = 4;
icon_state = "bulb"
},
/obj/structure/closet,
/obj/item/clothing/suit/hooded/wintercoat/miner,
@@ -161,8 +161,8 @@
/area/ruin/space/has_grav/powered/advancedlab)
"y" = (
/obj/machinery/light/small{
icon_state = "bulb";
dir = 1
dir = 1;
icon_state = "bulb"
},
/turf/open/floor/wood,
/area/ruin/space/has_grav/powered/advancedlab)
@@ -268,8 +268,8 @@
/area/ruin/space/has_grav/powered/advancedlab)
"R" = (
/obj/machinery/light/small{
icon_state = "bulb";
dir = 1
dir = 1;
icon_state = "bulb"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/powered/advancedlab)
+2 -2
View File
@@ -57,8 +57,8 @@
dir = 4
},
/mob/living/simple_animal/hostile/gorilla/familiar{
icon_state = "crawling";
dir = 4
dir = 4;
icon_state = "crawling"
},
/turf/open/floor/plating/beach/sand,
/area/ruin/powered)
+108 -108
View File
@@ -65,10 +65,10 @@
/area/ruin/space/has_grav/derelictoutpost/cargobay)
"ao" = (
/obj/machinery/power/apc{
start_charge = 0;
dir = 4;
name = "Cargo Bay APC";
pixel_x = 24
pixel_x = 24;
start_charge = 0
},
/obj/structure/cable{
icon_state = "0-8"
@@ -385,9 +385,9 @@
name = "gelatinous floor"
},
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 9;
icon_state = "trails_1";
dir = 9
name = "dried blood trail"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost)
@@ -398,9 +398,9 @@
name = "gelatinous floor"
},
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 4;
icon_state = "trails_1";
dir = 4
name = "dried blood trail"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost)
@@ -415,9 +415,9 @@
pixel_y = 32
},
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 4;
icon_state = "trails_1";
dir = 4
name = "dried blood trail"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost)
@@ -428,9 +428,9 @@
name = "gelatinous floor"
},
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 5;
icon_state = "trails_1";
dir = 5
name = "dried blood trail"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost)
@@ -479,9 +479,9 @@
/area/ruin/space/has_grav/derelictoutpost/dockedship)
"bw" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 5;
icon_state = "trails_1";
dir = 5
name = "dried blood trail"
},
/obj/structure/alien/weeds{
color = "#4BAE56";
@@ -598,9 +598,9 @@
},
/obj/effect/decal/cleanable/blood/old,
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 1;
icon_state = "trails_1";
dir = 1
name = "dried blood trail"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost)
@@ -755,9 +755,9 @@
/area/ruin/space/has_grav/derelictoutpost)
"bU" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 4;
icon_state = "trails_1";
dir = 4
name = "dried blood trail"
},
/turf/open/floor/plating{
icon_state = "wall_thermite";
@@ -766,17 +766,17 @@
/area/ruin/space/has_grav/derelictoutpost)
"bV" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 4;
icon_state = "trails_1";
dir = 4
name = "dried blood trail"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost)
"bW" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 6;
icon_state = "trails_1";
dir = 6
name = "dried blood trail"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost)
@@ -787,9 +787,9 @@
name = "gelatinous floor"
},
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 1;
icon_state = "trails_1";
dir = 1
name = "dried blood trail"
},
/obj/machinery/light{
dir = 4
@@ -813,11 +813,11 @@
/area/ruin/space/has_grav/derelictoutpost/powerstorage)
"ca" = (
/obj/machinery/power/apc{
start_charge = 0;
dir = 4;
name = "Power Storage APC";
pixel_x = 23;
pixel_y = 2
pixel_y = 2;
start_charge = 0
},
/obj/structure/cable{
icon_state = "0-8"
@@ -924,10 +924,10 @@
/area/ruin/space/has_grav/derelictoutpost)
"ck" = (
/obj/machinery/power/apc{
start_charge = 0;
dir = 2;
name = "Tradepost APC";
pixel_y = -24
pixel_y = -24;
start_charge = 0
},
/obj/structure/cable{
icon_state = "0-8"
@@ -942,9 +942,9 @@
},
/obj/structure/glowshroom/single,
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 1;
icon_state = "trails_1";
dir = 1
name = "dried blood trail"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost)
@@ -1106,9 +1106,9 @@
name = "gelatinous floor"
},
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 10;
icon_state = "trails_1";
dir = 10
name = "dried blood trail"
},
/mob/living/simple_animal/hostile/netherworld{
desc = "Awh its so sm-OH GOD WHAT THE FUCK.";
@@ -1126,9 +1126,9 @@
name = "gelatinous floor"
},
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 4;
icon_state = "trails_1";
dir = 4
name = "dried blood trail"
},
/turf/open/floor/plating/asteroid,
/area/ruin/space/has_grav/derelictoutpost)
@@ -1139,9 +1139,9 @@
name = "gelatinous floor"
},
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 5;
icon_state = "trails_1";
dir = 5
name = "dried blood trail"
},
/turf/open/floor/plating/asteroid,
/area/ruin/space/has_grav/derelictoutpost)
@@ -1182,9 +1182,9 @@
/area/ruin/space/has_grav/derelictoutpost/cargobay)
"cK" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 10;
icon_state = "trails_1";
dir = 10
name = "dried blood trail"
},
/obj/structure/alien/weeds{
color = "#4BAE56";
@@ -1198,9 +1198,9 @@
/area/ruin/space/has_grav/derelictoutpost/cargobay)
"cL" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 5;
icon_state = "trails_1";
dir = 5
name = "dried blood trail"
},
/obj/structure/alien/weeds{
color = "#4BAE56";
@@ -1268,9 +1268,9 @@
name = "gelatinous floor"
},
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 1;
icon_state = "trails_1";
dir = 1
name = "dried blood trail"
},
/turf/open/floor/plating/asteroid,
/area/ruin/space/has_grav/derelictoutpost)
@@ -1297,9 +1297,9 @@
/area/ruin/space/has_grav/derelictoutpost/cargobay)
"cX" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 1;
icon_state = "trails_1";
dir = 1
name = "dried blood trail"
},
/obj/structure/alien/weeds{
color = "#4BAE56";
@@ -1325,9 +1325,9 @@
},
/obj/effect/decal/cleanable/blood/old,
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 1;
icon_state = "trails_1";
dir = 1
name = "dried blood trail"
},
/turf/open/floor/plating/asteroid,
/area/ruin/space/has_grav/derelictoutpost)
@@ -1366,25 +1366,25 @@
/area/ruin/space/has_grav/derelictoutpost/cargobay)
"dd" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 10;
icon_state = "trails_1";
dir = 10
name = "dried blood trail"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost/cargobay)
"de" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 4;
icon_state = "trails_1";
dir = 4
name = "dried blood trail"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost/cargobay)
"df" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 4;
icon_state = "trails_1";
dir = 4
name = "dried blood trail"
},
/obj/structure/alien/weeds{
color = "#4BAE56";
@@ -1399,9 +1399,9 @@
/area/ruin/space/has_grav/derelictoutpost/cargobay)
"dg" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 4;
icon_state = "trails_1";
dir = 4
name = "dried blood trail"
},
/obj/structure/alien/weeds{
color = "#4BAE56";
@@ -1415,9 +1415,9 @@
/area/ruin/space/has_grav/derelictoutpost/cargobay)
"dh" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 4;
icon_state = "trails_1";
dir = 4
name = "dried blood trail"
},
/obj/structure/alien/weeds{
color = "#4BAE56";
@@ -1436,9 +1436,9 @@
/area/ruin/space/has_grav/derelictoutpost/cargobay)
"di" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 5;
icon_state = "trails_1";
dir = 5
name = "dried blood trail"
},
/obj/effect/decal/cleanable/cobweb{
icon_state = "cobweb2"
@@ -1499,9 +1499,9 @@
name = "gelatinous floor"
},
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 8;
icon_state = "trails_1";
dir = 8
name = "dried blood trail"
},
/turf/open/floor/plating/asteroid,
/area/ruin/space/has_grav/derelictoutpost)
@@ -1512,9 +1512,9 @@
name = "gelatinous floor"
},
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 6;
icon_state = "trails_1";
dir = 6
name = "dried blood trail"
},
/turf/open/floor/plating/asteroid,
/area/ruin/space/has_grav/derelictoutpost)
@@ -1574,9 +1574,9 @@
/area/ruin/space/has_grav/derelictoutpost)
"dv" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 9;
icon_state = "trails_1";
dir = 9
name = "dried blood trail"
},
/obj/structure/alien/weeds{
color = "#4BAE56";
@@ -1587,9 +1587,9 @@
/area/ruin/space/has_grav/derelictoutpost)
"dw" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 4;
icon_state = "trails_1";
dir = 4
name = "dried blood trail"
},
/obj/structure/alien/weeds{
color = "#4BAE56";
@@ -1605,9 +1605,9 @@
/area/ruin/space/has_grav/derelictoutpost)
"dx" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 4;
icon_state = "trails_1";
dir = 4
name = "dried blood trail"
},
/obj/structure/alien/weeds{
color = "#4BAE56";
@@ -1618,9 +1618,9 @@
/area/ruin/space/has_grav/derelictoutpost)
"dy" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 4;
icon_state = "trails_1";
dir = 4
name = "dried blood trail"
},
/obj/structure/alien/weeds{
color = "#4BAE56";
@@ -1632,9 +1632,9 @@
/area/ruin/space/has_grav/derelictoutpost)
"dz" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 5;
icon_state = "trails_1";
dir = 5
name = "dried blood trail"
},
/obj/effect/decal/cleanable/cobweb{
icon_state = "cobweb2"
@@ -1648,17 +1648,17 @@
/area/ruin/space/has_grav/derelictoutpost)
"dA" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 4;
icon_state = "trails_1";
dir = 4
name = "dried blood trail"
},
/turf/open/floor/plating/asteroid,
/area/ruin/space/has_grav/derelictoutpost)
"dB" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 6;
icon_state = "trails_1";
dir = 6
name = "dried blood trail"
},
/obj/structure/alien/weeds{
color = "#4BAE56";
@@ -1706,9 +1706,9 @@
/area/ruin/space/has_grav/derelictoutpost)
"dF" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 10;
icon_state = "trails_1";
dir = 10
name = "dried blood trail"
},
/obj/structure/alien/weeds{
color = "#4BAE56";
@@ -1719,9 +1719,9 @@
/area/ruin/space/has_grav/derelictoutpost)
"dG" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 8;
icon_state = "trails_1";
dir = 8
name = "dried blood trail"
},
/obj/structure/alien/weeds{
color = "#4BAE56";
@@ -1732,9 +1732,9 @@
/area/ruin/space/has_grav/derelictoutpost)
"dH" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 6;
icon_state = "trails_1";
dir = 6
name = "dried blood trail"
},
/obj/structure/alien/weeds{
color = "#4BAE56";
@@ -1779,9 +1779,9 @@
name = "gelatinous floor"
},
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 5;
icon_state = "trails_1";
dir = 5
name = "dried blood trail"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost/cargobay)
@@ -1795,9 +1795,9 @@
name = "gelatinous floor"
},
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 9;
icon_state = "trails_1";
dir = 9
name = "dried blood trail"
},
/obj/structure/cable{
icon_state = "1-2"
@@ -1806,9 +1806,9 @@
/area/ruin/space/has_grav/derelictoutpost)
"dN" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 8;
icon_state = "trails_1";
dir = 8
name = "dried blood trail"
},
/turf/open/floor/plating{
icon_state = "wall_thermite";
@@ -1823,9 +1823,9 @@
name = "gelatinous membrane"
},
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 8;
icon_state = "trails_1";
dir = 8
name = "dried blood trail"
},
/turf/open/floor/plating{
icon_state = "wall_thermite";
@@ -1840,9 +1840,9 @@
},
/obj/structure/glowshroom/single,
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 8;
icon_state = "trails_1";
dir = 8
name = "dried blood trail"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost)
@@ -1853,9 +1853,9 @@
name = "gelatinous floor"
},
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 6;
icon_state = "trails_1";
dir = 6
name = "dried blood trail"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost)
@@ -2021,10 +2021,10 @@
/area/ruin/space/has_grav/derelictoutpost/cargostorage)
"el" = (
/obj/machinery/power/apc{
start_charge = 0;
dir = 4;
name = "Cargo Storage APC";
pixel_x = 24
pixel_x = 24;
start_charge = 0
},
/obj/structure/cable{
icon_state = "0-2"
@@ -2099,35 +2099,35 @@
/area/ruin/space/has_grav/derelictoutpost)
"ew" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 8;
icon_state = "trails_1";
dir = 8
name = "dried blood trail"
},
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost/cargostorage)
"ex" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 8;
icon_state = "trails_1";
dir = 8
name = "dried blood trail"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost/cargostorage)
"ey" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 8;
icon_state = "trails_1";
dir = 8
name = "dried blood trail"
},
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost/cargostorage)
"ez" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 5;
icon_state = "trails_1";
dir = 5
name = "dried blood trail"
},
/obj/structure/cable{
icon_state = "1-2"
@@ -2188,9 +2188,9 @@
/area/ruin/space/has_grav/derelictoutpost/cargostorage)
"eI" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 10;
icon_state = "trails_1";
dir = 10
name = "dried blood trail"
},
/obj/structure/cable{
icon_state = "1-4"
@@ -2204,9 +2204,9 @@
name = "pried-open airlock"
},
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 4;
icon_state = "trails_1";
dir = 4
name = "dried blood trail"
},
/obj/structure/cable{
icon_state = "4-8"
@@ -2215,9 +2215,9 @@
/area/ruin/space/has_grav/derelictoutpost/cargostorage)
"eK" = (
/obj/effect/decal/cleanable/blood/old{
name = "dried blood trail";
dir = 6;
icon_state = "trails_1";
dir = 6
name = "dried blood trail"
},
/obj/structure/cable{
icon_state = "1-8"
@@ -287,9 +287,9 @@
/area/space/nearstation)
"M" = (
/obj/structure/fluff/broken_flooring{
name = "broken plating";
dir = 8;
icon_state = "plating";
dir = 8
name = "broken plating"
},
/turf/template_noop,
/area/space/nearstation)
+4 -4
View File
@@ -16,8 +16,8 @@
"ag" = (
/obj/machinery/porta_turret{
dir = 8;
set_obj_flags = "EMAGGED";
installation = /obj/item/gun/energy/lasercannon
installation = /obj/item/gun/energy/lasercannon;
set_obj_flags = "EMAGGED"
},
/turf/open/floor/engine,
/area/awaymission/BMPship/Aft)
@@ -2110,8 +2110,8 @@
"gl" = (
/obj/machinery/porta_turret{
dir = 8;
set_obj_flags = "EMAGGED";
installation = /obj/item/gun/energy/lasercannon
installation = /obj/item/gun/energy/lasercannon;
set_obj_flags = "EMAGGED"
},
/turf/open/floor/engine,
/area/awaymission/BMPship/Fore)
+34 -34
View File
@@ -5,8 +5,8 @@
"ab" = (
/obj/structure/lattice,
/obj/structure/fluff/broken_flooring{
icon_state = "singular";
dir = 1
dir = 1;
icon_state = "singular"
},
/turf/template_noop,
/area/space/nearstation)
@@ -27,8 +27,8 @@
/area/space/nearstation)
"af" = (
/obj/structure/fluff/broken_flooring{
icon_state = "pile";
dir = 8
dir = 8;
icon_state = "pile"
},
/turf/template_noop,
/area/template_noop)
@@ -45,8 +45,8 @@
/area/ruin/unpowered)
"aj" = (
/obj/structure/fluff/broken_flooring{
icon_state = "pile";
dir = 4
dir = 4;
icon_state = "pile"
},
/turf/template_noop,
/area/template_noop)
@@ -58,8 +58,8 @@
/area/ruin/unpowered)
"al" = (
/obj/structure/fluff/broken_flooring{
icon_state = "singular";
dir = 4
dir = 4;
icon_state = "singular"
},
/obj/structure/lattice,
/turf/template_noop,
@@ -133,17 +133,17 @@
/area/ruin/unpowered)
"az" = (
/obj/structure/fluff/broken_flooring{
name = "broken plating";
dir = 8;
icon_state = "plating";
dir = 8
name = "broken plating"
},
/obj/structure/lattice,
/turf/template_noop,
/area/ruin/unpowered)
"aA" = (
/obj/structure/fluff/broken_flooring{
icon_state = "pile";
dir = 1
dir = 1;
icon_state = "pile"
},
/turf/template_noop,
/area/template_noop)
@@ -405,8 +405,8 @@
/area/ruin/unpowered)
"bt" = (
/obj/structure/fluff/broken_flooring{
icon_state = "side";
dir = 1
dir = 1;
icon_state = "side"
},
/obj/structure/lattice,
/turf/template_noop,
@@ -424,34 +424,34 @@
"bw" = (
/obj/structure/lattice,
/obj/structure/fluff/broken_flooring{
name = "broken plating";
dir = 1;
icon_state = "plating";
dir = 1
name = "broken plating"
},
/turf/template_noop,
/area/ruin/unpowered)
"bx" = (
/obj/structure/fluff/broken_flooring{
name = "broken plating";
dir = 4;
icon_state = "plating";
dir = 4
name = "broken plating"
},
/obj/structure/lattice,
/turf/template_noop,
/area/ruin/unpowered)
"by" = (
/obj/structure/fluff/broken_flooring{
icon_state = "pile";
dir = 4
dir = 4;
icon_state = "pile"
},
/turf/open/floor/plasteel/airless,
/area/ruin/unpowered)
"bz" = (
/obj/structure/lattice,
/obj/structure/fluff/broken_flooring{
name = "broken plating";
dir = 4;
icon_state = "plating";
dir = 4
name = "broken plating"
},
/turf/template_noop,
/area/ruin/unpowered)
@@ -464,38 +464,38 @@
"bC" = (
/obj/structure/lattice,
/obj/structure/fluff/broken_flooring{
icon_state = "corner";
dir = 1
dir = 1;
icon_state = "corner"
},
/turf/template_noop,
/area/ruin/unpowered)
"bD" = (
/obj/structure/fluff/broken_flooring{
icon_state = "singular";
dir = 4
dir = 4;
icon_state = "singular"
},
/turf/open/floor/plasteel/airless,
/area/ruin/unpowered)
"bE" = (
/obj/structure/lattice,
/obj/structure/fluff/broken_flooring{
icon_state = "corner";
dir = 8
dir = 8;
icon_state = "corner"
},
/turf/template_noop,
/area/ruin/unpowered)
"bF" = (
/obj/structure/lattice,
/obj/structure/fluff/broken_flooring{
icon_state = "side";
dir = 4
dir = 4;
icon_state = "side"
},
/turf/template_noop,
/area/ruin/unpowered)
"bG" = (
/obj/structure/fluff/broken_flooring{
icon_state = "singular";
dir = 4
dir = 4;
icon_state = "singular"
},
/turf/template_noop,
/area/template_noop)
@@ -510,9 +510,9 @@
"bI" = (
/obj/structure/lattice,
/obj/structure/fluff/broken_flooring{
name = "broken plating";
dir = 8;
icon_state = "plating";
dir = 8
name = "broken plating"
},
/turf/template_noop,
/area/ruin/unpowered)
+2 -2
View File
@@ -149,8 +149,8 @@
/area/ruin/space/has_grav/ancientstation/hivebot)
"aF" = (
/obj/structure/shuttle/engine/large{
icon_state = "large_engine";
dir = 4
dir = 4;
icon_state = "large_engine"
},
/turf/closed/wall,
/area/ruin/space/has_grav/ancientstation/hivebot)
@@ -54,15 +54,15 @@
/area/ruin/powered)
"m" = (
/obj/structure/chair/old{
icon_state = "chairold";
dir = 1
dir = 1;
icon_state = "chairold"
},
/turf/open/floor/oldshuttle,
/area/ruin/powered)
"n" = (
/obj/structure/chair/old{
icon_state = "chairold";
dir = 1
dir = 1;
icon_state = "chairold"
},
/obj/item/crowbar/large{
desc = "It's a big crowbar. It doesn't fit in your pockets, because it's big. It feels oddly heavy..";
@@ -73,8 +73,8 @@
/area/ruin/powered)
"o" = (
/obj/structure/chair/old{
icon_state = "chairold";
dir = 1
dir = 1;
icon_state = "chairold"
},
/mob/living/simple_animal/hostile/retaliate/spaceman,
/turf/open/floor/oldshuttle,
File diff suppressed because it is too large Load Diff
+78 -78
View File
@@ -40,8 +40,8 @@
/area/ruin/space/diner/interior)
"ai" = (
/obj/effect/spawner/structure/window/hollow/reinforced/end{
icon_state = "hrwindow_spawner_end";
dir = 1
dir = 1;
icon_state = "hrwindow_spawner_end"
},
/turf/open/floor/plating,
/area/ruin/space/diner/interior)
@@ -116,8 +116,8 @@
/area/ruin/space/diner)
"aw" = (
/obj/effect/spawner/structure/window/hollow/reinforced/end{
icon_state = "hrwindow_spawner_end";
dir = 4
dir = 4;
icon_state = "hrwindow_spawner_end"
},
/turf/open/floor/plating/airless,
/area/ruin/space/diner)
@@ -253,8 +253,8 @@
/area/ruin/space/diner/interior)
"aQ" = (
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 10
dir = 10;
icon_state = "pipe11-2"
},
/turf/open/floor/plating,
/area/ruin/space/diner/interior)
@@ -438,8 +438,8 @@
},
/obj/machinery/grill,
/obj/machinery/light/small/broken{
icon_state = "bulb-broken";
dir = 1
dir = 1;
icon_state = "bulb-broken"
},
/obj/machinery/power/apc/highcap/five_k{
name = "Space Diner APC";
@@ -468,8 +468,8 @@
/area/ruin/space/diner/interior)
"bx" = (
/obj/structure/toilet/secret/low_loot{
icon_state = "toilet00";
dir = 4
dir = 4;
icon_state = "toilet00"
},
/obj/effect/decal/cleanable/cobweb,
/obj/effect/decal/cleanable/dirt,
@@ -509,8 +509,8 @@
/area/ruin/space/diner/interior)
"bB" = (
/obj/effect/spawner/structure/window/hollow/reinforced/end{
icon_state = "hrwindow_spawner_end";
dir = 8
dir = 8;
icon_state = "hrwindow_spawner_end"
},
/obj/structure/cable{
icon_state = "0-4"
@@ -529,8 +529,8 @@
/area/ruin/space/diner/interior)
"bD" = (
/obj/effect/spawner/structure/window/hollow/reinforced/end{
icon_state = "hrwindow_spawner_end";
dir = 4
dir = 4;
icon_state = "hrwindow_spawner_end"
},
/obj/structure/cable{
icon_state = "0-8"
@@ -568,8 +568,8 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 4
dir = 4;
icon_state = "pipe11-2"
},
/turf/open/floor/plasteel,
/area/ruin/space/diner/interior)
@@ -579,8 +579,8 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 4
dir = 4;
icon_state = "pipe11-2"
},
/turf/open/floor/plasteel,
/area/ruin/space/diner/interior)
@@ -594,8 +594,8 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 4
dir = 4;
icon_state = "pipe11-2"
},
/turf/open/floor/plasteel,
/area/ruin/space/diner/interior)
@@ -616,8 +616,8 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 10
dir = 10;
icon_state = "pipe11-2"
},
/turf/open/floor/plasteel,
/area/ruin/space/diner/interior)
@@ -662,8 +662,8 @@
/area/ruin/space/diner/interior)
"bP" = (
/obj/structure/toilet/secret/low_loot{
icon_state = "toilet00";
dir = 4
dir = 4;
icon_state = "toilet00"
},
/obj/structure/window/reinforced/spawner/north,
/obj/effect/decal/cleanable/dirt,
@@ -673,8 +673,8 @@
"bQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 6
dir = 6;
icon_state = "pipe11-2"
},
/turf/open/floor/plasteel,
/area/ruin/space/diner/interior)
@@ -727,8 +727,8 @@
/area/ruin/space/diner/interior)
"bX" = (
/obj/effect/spawner/structure/window/hollow/reinforced/end{
icon_state = "hrwindow_spawner_end";
dir = 1
dir = 1;
icon_state = "hrwindow_spawner_end"
},
/obj/structure/cable{
icon_state = "0-2"
@@ -756,24 +756,24 @@
"ca" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/manifold/general/hidden{
icon_state = "manifold-2";
dir = 8
dir = 8;
icon_state = "manifold-2"
},
/turf/open/floor/plasteel,
/area/ruin/space/diner/interior)
"cb" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 4
dir = 4;
icon_state = "pipe11-2"
},
/turf/open/floor/plasteel,
/area/ruin/space/diner/interior)
"cc" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 10
dir = 10;
icon_state = "pipe11-2"
},
/turf/open/floor/plasteel,
/area/ruin/space/diner/interior)
@@ -962,8 +962,8 @@
icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 4
dir = 4;
icon_state = "pipe11-2"
},
/obj/item/beacon,
/turf/open/floor/plasteel/dark,
@@ -973,8 +973,8 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 4
dir = 4;
icon_state = "pipe11-2"
},
/turf/open/floor/plasteel/dark,
/area/ruin/space/diner/interior)
@@ -993,8 +993,8 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 4
dir = 4;
icon_state = "pipe11-2"
},
/turf/open/floor/plasteel/dark,
/area/ruin/space/diner/interior)
@@ -1105,8 +1105,8 @@
/area/ruin/space/diner/interior)
"cM" = (
/obj/machinery/light/broken{
icon_state = "tube-broken";
dir = 1
dir = 1;
icon_state = "tube-broken"
},
/obj/effect/decal/cleanable/dirt{
desc = "A thin layer of dust coating the floor.";
@@ -1146,8 +1146,8 @@
},
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/machinery/computer/arcade{
icon_state = "arcade";
dir = 8
dir = 8;
icon_state = "arcade"
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
@@ -1161,8 +1161,8 @@
/area/ruin/space/diner/interior)
"cS" = (
/obj/effect/spawner/structure/window/hollow/reinforced/end{
icon_state = "hrwindow_spawner_end";
dir = 1
dir = 1;
icon_state = "hrwindow_spawner_end"
},
/obj/structure/cable,
/obj/structure/cable{
@@ -1242,8 +1242,8 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 5
dir = 5;
icon_state = "pipe11-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
@@ -1257,8 +1257,8 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 4
dir = 4;
icon_state = "pipe11-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
@@ -1287,8 +1287,8 @@
icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 4
dir = 4;
icon_state = "pipe11-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
@@ -1311,8 +1311,8 @@
icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 9
dir = 9;
icon_state = "pipe11-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
@@ -1351,8 +1351,8 @@
icon_state = "1-2"
},
/obj/machinery/computer/teleporter{
icon_state = "computer";
dir = 1
dir = 1;
icon_state = "computer"
},
/obj/structure/cable,
/turf/open/floor/plasteel/dark,
@@ -1414,8 +1414,8 @@
"ds" = (
/obj/structure/cable,
/obj/machinery/power/solar_control{
icon_state = "computer";
dir = 4
dir = 4;
icon_state = "computer"
},
/turf/open/floor/plating,
/area/ruin/space/diner/interior)
@@ -1427,8 +1427,8 @@
/area/ruin/space/diner/interior)
"dv" = (
/obj/effect/spawner/structure/window/hollow/reinforced/end{
icon_state = "hrwindow_spawner_end";
dir = 4
dir = 4;
icon_state = "hrwindow_spawner_end"
},
/obj/structure/cable,
/obj/structure/cable{
@@ -1449,8 +1449,8 @@
dir = 1
},
/obj/machinery/light/broken{
icon_state = "tube-broken";
dir = 8
dir = 8;
icon_state = "tube-broken"
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
@@ -1492,8 +1492,8 @@
name = "dust"
},
/obj/item/chair{
icon_state = "chair_toppled";
dir = 1
dir = 1;
icon_state = "chair_toppled"
},
/turf/open/floor/carpet,
/area/ruin/space/diner/interior)
@@ -1508,8 +1508,8 @@
/area/ruin/space/diner/interior)
"dE" = (
/obj/machinery/light/small/broken{
icon_state = "bulb-broken";
dir = 1
dir = 1;
icon_state = "bulb-broken"
},
/turf/open/floor/engine/airless,
/area/ruin/space/diner)
@@ -1663,8 +1663,8 @@
/area/ruin/space/diner/interior)
"dV" = (
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
icon_state = "hrwindow_spawner_directional";
dir = 10
dir = 10;
icon_state = "hrwindow_spawner_directional"
},
/turf/open/floor/plating,
/area/ruin/space/diner/interior)
@@ -1674,22 +1674,22 @@
/area/ruin/space/diner/interior)
"dX" = (
/obj/effect/spawner/structure/window/hollow/reinforced/end{
icon_state = "hrwindow_spawner_end";
dir = 4
dir = 4;
icon_state = "hrwindow_spawner_end"
},
/turf/open/floor/plating,
/area/ruin/space/diner/interior)
"dY" = (
/obj/effect/spawner/structure/window/hollow/reinforced/end{
icon_state = "hrwindow_spawner_end";
dir = 8
dir = 8;
icon_state = "hrwindow_spawner_end"
},
/turf/open/floor/plating,
/area/ruin/space/diner/interior)
"dZ" = (
/obj/effect/spawner/structure/window/hollow/reinforced/directional{
icon_state = "hrwindow_spawner_directional";
dir = 6
dir = 6;
icon_state = "hrwindow_spawner_directional"
},
/turf/open/floor/plating,
/area/ruin/space/diner/interior)
@@ -1728,8 +1728,8 @@
/area/ruin/space/diner)
"ef" = (
/obj/machinery/light/small/broken{
icon_state = "bulb-broken";
dir = 1
dir = 1;
icon_state = "bulb-broken"
},
/obj/machinery/vending/snack,
/obj/effect/turf_decal/bot,
@@ -1737,8 +1737,8 @@
/area/ruin/space/diner)
"eg" = (
/obj/effect/spawner/structure/window/hollow/reinforced/end{
icon_state = "hrwindow_spawner_end";
dir = 1
dir = 1;
icon_state = "hrwindow_spawner_end"
},
/turf/open/floor/plating/airless,
/area/ruin/space/diner)
+32 -32
View File
@@ -125,8 +125,8 @@
/area/ruin/space/has_grav/hotel/guestroom/room_3)
"ay" = (
/obj/structure/window{
icon_state = "window";
dir = 8
dir = 8;
icon_state = "window"
},
/obj/structure/toilet,
/turf/open/floor/plasteel/showroomfloor,
@@ -166,8 +166,8 @@
/area/ruin/space/has_grav/hotel/guestroom/room_4)
"aG" = (
/obj/structure/window{
icon_state = "window";
dir = 8
dir = 8;
icon_state = "window"
},
/obj/structure/toilet,
/turf/open/floor/plasteel/showroomfloor,
@@ -207,8 +207,8 @@
/area/ruin/space/has_grav/hotel/guestroom/room_5)
"aO" = (
/obj/structure/window{
icon_state = "window";
dir = 8
dir = 8;
icon_state = "window"
},
/obj/structure/toilet,
/turf/open/floor/plasteel/showroomfloor,
@@ -248,8 +248,8 @@
/area/ruin/space/has_grav/hotel/guestroom/room_6)
"aW" = (
/obj/structure/window{
icon_state = "window";
dir = 8
dir = 8;
icon_state = "window"
},
/obj/structure/toilet,
/turf/open/floor/plasteel/showroomfloor,
@@ -287,8 +287,8 @@
/area/ruin/unpowered/no_grav)
"be" = (
/obj/structure/window{
icon_state = "window";
dir = 8
dir = 8;
icon_state = "window"
},
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/hotel/guestroom/room_3)
@@ -319,8 +319,8 @@
/area/ruin/space/has_grav/hotel/guestroom/room_3)
"bk" = (
/obj/structure/window{
icon_state = "window";
dir = 8
dir = 8;
icon_state = "window"
},
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/hotel/guestroom/room_4)
@@ -351,8 +351,8 @@
/area/ruin/space/has_grav/hotel/guestroom/room_4)
"bq" = (
/obj/structure/window{
icon_state = "window";
dir = 8
dir = 8;
icon_state = "window"
},
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/hotel/guestroom/room_5)
@@ -383,8 +383,8 @@
/area/ruin/space/has_grav/hotel/guestroom/room_5)
"bw" = (
/obj/structure/window{
icon_state = "window";
dir = 8
dir = 8;
icon_state = "window"
},
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/hotel/guestroom/room_6)
@@ -1067,8 +1067,8 @@
/area/ruin/space/has_grav/hotel/guestroom/room_2)
"dl" = (
/obj/structure/window{
icon_state = "window";
dir = 8
dir = 8;
icon_state = "window"
},
/obj/structure/toilet,
/turf/open/floor/plasteel/showroomfloor,
@@ -1131,8 +1131,8 @@
/area/ruin/space/has_grav/hotel/guestroom/room_1)
"dt" = (
/obj/structure/window{
icon_state = "window";
dir = 8
dir = 8;
icon_state = "window"
},
/obj/structure/toilet,
/turf/open/floor/plasteel/showroomfloor,
@@ -1230,8 +1230,8 @@
/area/ruin/space/has_grav/hotel/guestroom/room_2)
"dI" = (
/obj/structure/window{
icon_state = "window";
dir = 8
dir = 8;
icon_state = "window"
},
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/hotel/guestroom/room_2)
@@ -1262,8 +1262,8 @@
/area/ruin/space/has_grav/hotel/guestroom/room_1)
"dP" = (
/obj/structure/window{
icon_state = "window";
dir = 8
dir = 8;
icon_state = "window"
},
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/hotel/guestroom/room_1)
@@ -2564,16 +2564,16 @@
/area/ruin/space/has_grav/hotel/workroom)
"hG" = (
/obj/effect/mob_spawn/human/hotel_staff{
icon_state = "sleeper_s";
dir = 1
dir = 1;
icon_state = "sleeper_s"
},
/obj/machinery/light,
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/hotel/workroom)
"hH" = (
/obj/effect/mob_spawn/human/hotel_staff{
icon_state = "sleeper_s";
dir = 1
dir = 1;
icon_state = "sleeper_s"
},
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/hotel/workroom)
@@ -4283,8 +4283,8 @@
/area/ruin/space/has_grav/hotel/security)
"lG" = (
/obj/structure/window{
icon_state = "window";
dir = 1
dir = 1;
icon_state = "window"
},
/obj/machinery/light{
dir = 8
@@ -4307,8 +4307,8 @@
/obj/item/clothing/shoes/sandal,
/obj/item/clothing/shoes/sandal,
/obj/structure/window{
icon_state = "window";
dir = 1
dir = 1;
icon_state = "window"
},
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/hotel/pool)
@@ -9,9 +9,9 @@
dwidth = 11;
height = 22;
id = "whiteship_away";
json_key = "whiteship";
name = "Deep Space";
width = 35;
json_key = "whiteship"
width = 35
},
/turf/open/space,
/area/space)
@@ -336,16 +336,6 @@
"yf" = (
/turf/open/space/basic,
/area/space/nearstation)
"zw" = (
/obj/structure/closet/crate,
/obj/item/stack/sheet/mineral/plasma{
amount = 50
},
/obj/item/stack/sheet/mineral/plasma{
amount = 10
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"zS" = (
/turf/open/space/basic,
/area/space)
@@ -715,12 +705,6 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"WB" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"Ys" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
@@ -1164,15 +1148,15 @@ zS
MP
dw
lG
WB
eP
Jq
WB
eP
UD
Cx
UD
WB
eP
Jq
WB
eP
UD
MP
tw
@@ -1276,15 +1260,15 @@ zS
MP
Cb
AC
WB
eP
mW
WB
eP
Kl
Cx
Kl
WB
eP
mW
WB
eP
Kl
MP
tw
@@ -1505,11 +1489,11 @@ Ok
CH
GI
Ok
zw
zw
zw
zw
zw
gF
gF
gF
gF
gF
MP
tw
yf
@@ -111,26 +111,14 @@
/obj/structure/lattice,
/turf/open/space/basic,
/area/space/nearstation)
"uC" = (
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
/area/space/nearstation)
"wt" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/closet/radiation,
/turf/open/floor/plasteel,
/area/engine/engineering)
"wS" = (
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
/area/space/nearstation)
"yf" = (
/turf/open/space/basic,
/area/space/nearstation)
"yA" = (
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
/area/space/nearstation)
"zS" = (
/turf/open/space/basic,
/area/space)
@@ -224,10 +212,6 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"Le" = (
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
/area/space/nearstation)
"LS" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/turf/open/floor/plating/airless,
@@ -397,17 +381,17 @@ ZT
ZT
ZT
ZT
Le
hK
tw
Le
Le
hK
hK
tw
Le
Le
hK
hK
tw
Le
Le
Le
hK
hK
hK
YZ
Oj
YZ
@@ -453,17 +437,17 @@ ZT
ZT
ZT
ZT
Le
hK
tw
Le
Le
hK
hK
tw
Le
Le
hK
hK
tw
Le
Le
Le
hK
hK
hK
YZ
Oj
YZ
@@ -509,17 +493,17 @@ Ke
EL
Tk
MP
Le
hK
tw
Le
Le
hK
hK
tw
Le
Le
hK
hK
tw
Le
Le
Le
hK
hK
hK
YZ
Oj
YZ
+32 -32
View File
@@ -2411,8 +2411,8 @@
/area/awaymission/snowdin/post/dorm)
"fw" = (
/obj/machinery/sleeper{
icon_state = "sleeper";
dir = 4
dir = 4;
icon_state = "sleeper"
},
/obj/effect/turf_decal/tile/blue{
dir = 4
@@ -6704,9 +6704,9 @@
"oo" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4;
piping_layer = 3;
pixel_x = 5;
pixel_y = 5;
piping_layer = 3
pixel_y = 5
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
@@ -6714,9 +6714,9 @@
"op" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4;
piping_layer = 3;
pixel_x = 5;
pixel_y = 5;
piping_layer = 3
pixel_y = 5
},
/turf/open/floor/plasteel,
/area/awaymission/snowdin/post/engineering)
@@ -9707,10 +9707,10 @@
/area/awaymission/snowdin/post/broken_shuttle)
"wc" = (
/obj/machinery/computer{
name = "Shuttle Transist Console";
desc = "A console meant for calling and sending a transit ferry. It seems iced-over and non-functional.";
dir = 1;
icon_screen = null
icon_screen = null;
name = "Shuttle Transist Console"
},
/turf/open/floor/mineral/titanium/blue,
/area/awaymission/snowdin/post/broken_shuttle)
@@ -9799,9 +9799,9 @@
"wm" = (
/obj/machinery/porta_turret/centcom_shuttle/weak{
desc = "A turret built with substandard parts and run down further with age.";
icon_state = "syndie_off";
dir = 9;
faction = list("pirate")
faction = list("pirate");
icon_state = "syndie_off"
},
/turf/open/floor/plating/snowed/smoothed,
/area/awaymission/snowdin/cave)
@@ -9926,8 +9926,8 @@
/area/awaymission/snowdin/outside)
"wC" = (
/obj/vehicle/ridden/atv{
icon_state = "atv";
dir = 4
dir = 4;
icon_state = "atv"
},
/obj/effect/light_emitter{
name = "outdoor light";
@@ -10650,10 +10650,10 @@
/area/awaymission/snowdin/cave)
"yu" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
name = "toxin out";
dir = 8;
frequency = 1442;
id_tag = "snowdin_toxins_mine_1";
frequency = 1442
name = "toxin out"
},
/turf/open/floor/engine/vacuum,
/area/awaymission/snowdin/cave)
@@ -11025,8 +11025,8 @@
/area/awaymission/snowdin/post/minipost)
"zq" = (
/obj/vehicle/ridden/atv{
icon_state = "atv";
dir = 8
dir = 8;
icon_state = "atv"
},
/turf/open/floor/plating,
/area/awaymission/snowdin/post/minipost)
@@ -11939,8 +11939,8 @@
/area/awaymission/snowdin/cave)
"BO" = (
/obj/effect/turf_decal/stripes/end{
icon_state = "warn_end";
dir = 1
dir = 1;
icon_state = "warn_end"
},
/turf/open/floor/plating/snowed/cavern,
/area/awaymission/snowdin/cave/cavern)
@@ -11953,8 +11953,8 @@
/area/awaymission/snowdin/cave/cavern)
"BQ" = (
/obj/effect/turf_decal/stripes/end{
icon_state = "warn_end";
dir = 8
dir = 8;
icon_state = "warn_end"
},
/turf/open/floor/plating/snowed/cavern,
/area/awaymission/snowdin/cave/cavern)
@@ -12268,8 +12268,8 @@
/area/awaymission/snowdin/cave)
"CP" = (
/obj/structure/shuttle/engine/heater{
icon_state = "heater";
dir = 4
dir = 4;
icon_state = "heater"
},
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -12803,8 +12803,8 @@
/area/awaymission/snowdin/cave)
"DU" = (
/obj/structure/shuttle/engine/heater{
icon_state = "heater";
dir = 4
dir = 4;
icon_state = "heater"
},
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -13244,8 +13244,8 @@
/area/awaymission/snowdin/cave)
"EN" = (
/obj/machinery/sleeper/syndie{
icon_state = "sleeper_s";
dir = 1
dir = 1;
icon_state = "sleeper_s"
},
/obj/effect/turf_decal/bot_white,
/turf/open/floor/plasteel/dark,
@@ -13257,8 +13257,8 @@
"EP" = (
/obj/effect/turf_decal/bot_white,
/obj/machinery/sleeper/syndie{
icon_state = "sleeper_s";
dir = 1
dir = 1;
icon_state = "sleeper_s"
},
/turf/open/floor/plasteel/dark,
/area/awaymission/snowdin/cave)
@@ -14452,8 +14452,8 @@
/area/awaymission/snowdin/post/mining_main/mechbay)
"In" = (
/obj/mecha/working/ripley/mining{
icon_state = "ripley";
dir = 1
dir = 1;
icon_state = "ripley"
},
/obj/effect/turf_decal/bot,
/turf/open/floor/mech_bay_recharge_floor,
@@ -14513,8 +14513,8 @@
/area/awaymission/snowdin/post/mining_main)
"Ix" = (
/obj/vehicle/ridden/atv{
icon_state = "atv";
dir = 1
dir = 1;
icon_state = "atv"
},
/obj/effect/decal/cleanable/oil,
/turf/open/floor/plating,
+6 -6
View File
@@ -468,8 +468,8 @@
/area/awaymission/centcomAway/hangar)
"cO" = (
/obj/machinery/sleep_console{
icon_state = "console";
dir = 8
dir = 8;
icon_state = "console"
},
/turf/open/floor/mineral/titanium/blue,
/area/awaymission/centcomAway/hangar)
@@ -746,8 +746,8 @@
/area/awaymission/centcomAway/general)
"eI" = (
/obj/machinery/sleep_console{
icon_state = "console";
dir = 8
dir = 8;
icon_state = "console"
},
/turf/open/indestructible,
/area/awaymission/centcomAway/general)
@@ -1787,8 +1787,8 @@
/area/awaymission/centcomAway/general)
"kD" = (
/obj/machinery/door/window/northright{
icon_state = "right";
dir = 2
dir = 2;
icon_state = "right"
},
/turf/open/indestructible,
/area/awaymission/centcomAway/general)
+24 -24
View File
@@ -3129,8 +3129,8 @@
/obj/structure/table,
/obj/item/gun/ballistic/revolver/russian/soul,
/turf/open/floor/plasteel/airless{
icon_state = "whitered";
dir = 4
dir = 4;
icon_state = "whitered"
},
/area/awaymission/academy/academyaft)
"iY" = (
@@ -3197,8 +3197,8 @@
icon_state = "4-8"
},
/turf/open/floor/plasteel/airless{
icon_state = "whitered";
dir = 4
dir = 4;
icon_state = "whitered"
},
/area/awaymission/academy/academyaft)
"jh" = (
@@ -3258,8 +3258,8 @@
name = "The preserved brain of Harry Houdini"
},
/turf/open/floor/plasteel/airless{
icon_state = "whitered";
dir = 4
dir = 4;
icon_state = "whitered"
},
/area/awaymission/academy/academyaft)
"jp" = (
@@ -3365,8 +3365,8 @@
/obj/structure/window/reinforced,
/obj/item/batterer,
/turf/open/floor/plasteel/airless{
icon_state = "whitered";
dir = 4
dir = 4;
icon_state = "whitered"
},
/area/awaymission/academy/academyaft)
"jB" = (
@@ -3616,8 +3616,8 @@
/area/awaymission/academy/academygate)
"kw" = (
/turf/closed/indestructible/fakeglass{
icon_state = "fakewindows";
dir = 8
dir = 8;
icon_state = "fakewindows"
},
/area/awaymission/academy/headmaster)
"kx" = (
@@ -3671,8 +3671,8 @@
/area/awaymission/academy/academyaft)
"kF" = (
/turf/closed/indestructible/fakeglass{
icon_state = "fakewindows2";
dir = 8
dir = 8;
icon_state = "fakewindows2"
},
/area/awaymission/academy/headmaster)
"kG" = (
@@ -4270,8 +4270,8 @@
/area/awaymission/academy/academycellar)
"mW" = (
/turf/closed/indestructible/fakeglass{
icon_state = "fakewindows";
dir = 4
dir = 4;
icon_state = "fakewindows"
},
/area/awaymission/academy/headmaster)
"mX" = (
@@ -4284,14 +4284,14 @@
/area/space/nearstation)
"mZ" = (
/turf/closed/indestructible/fakeglass{
icon_state = "fakewindows";
dir = 1
dir = 1;
icon_state = "fakewindows"
},
/area/awaymission/academy/headmaster)
"na" = (
/turf/closed/indestructible/fakeglass{
icon_state = "fakewindows2";
dir = 1
dir = 1;
icon_state = "fakewindows2"
},
/area/awaymission/academy/headmaster)
"nb" = (
@@ -4310,20 +4310,20 @@
/area/awaymission/academy/headmaster)
"nd" = (
/turf/closed/indestructible/fakeglass{
icon_state = "fakewindows";
dir = 1
dir = 1;
icon_state = "fakewindows"
},
/area/awaymission/academy/academyengine)
"ne" = (
/turf/closed/indestructible/fakeglass{
icon_state = "fakewindows2";
dir = 1
dir = 1;
icon_state = "fakewindows2"
},
/area/awaymission/academy/academyengine)
"nf" = (
/turf/closed/indestructible/fakeglass{
icon_state = "fakewindows2";
dir = 6
dir = 6;
icon_state = "fakewindows2"
},
/area/awaymission/academy/headmaster)
"ng" = (
+16 -16
View File
@@ -11,8 +11,8 @@
"ad" = (
/turf/open/lava/smooth{
desc = "Looks hot.";
luminosity = 5;
initial_gas_mix = "n2=23;o2=14"
initial_gas_mix = "n2=23;o2=14";
luminosity = 5
},
/area/awaymission/caves/BMP_asteroid/level_four)
"ae" = (
@@ -35,8 +35,8 @@
"ah" = (
/turf/open/lava/smooth{
desc = "Looks hot.";
luminosity = 5;
initial_gas_mix = "n2=23;o2=14"
initial_gas_mix = "n2=23;o2=14";
luminosity = 5
},
/area/awaymission/caves/BMP_asteroid/level_three)
"ai" = (
@@ -305,8 +305,8 @@
/obj/effect/forcefield/cult,
/turf/open/lava/smooth{
desc = "Looks hot.";
luminosity = 5;
initial_gas_mix = "n2=23;o2=14"
initial_gas_mix = "n2=23;o2=14";
luminosity = 5
},
/area/awaymission/caves/BMP_asteroid/level_four)
"aW" = (
@@ -540,8 +540,8 @@
"bM" = (
/turf/open/lava/smooth{
desc = "Looks hot.";
luminosity = 5;
initial_gas_mix = "n2=23;o2=14"
initial_gas_mix = "n2=23;o2=14";
luminosity = 5
},
/area/awaymission/caves/BMP_asteroid)
"bN" = (
@@ -550,8 +550,8 @@
"bO" = (
/turf/open/lava/smooth{
desc = "Looks hot.";
luminosity = 5;
initial_gas_mix = "n2=23;o2=14"
initial_gas_mix = "n2=23;o2=14";
luminosity = 5
},
/area/awaymission/caves/BMP_asteroid/level_two)
"bP" = (
@@ -1818,8 +1818,8 @@
/area/awaymission/caves/BMP_asteroid)
"fQ" = (
/turf/open/floor/plasteel/elevatorshaft{
name = "elevator flooring";
initial_gas_mix = "n2=23;o2=14"
initial_gas_mix = "n2=23;o2=14";
name = "elevator flooring"
},
/area/awaymission/caves/BMP_asteroid)
"fR" = (
@@ -1843,8 +1843,8 @@
"fU" = (
/obj/effect/landmark/awaystart,
/turf/open/floor/plasteel/elevatorshaft{
name = "elevator flooring";
initial_gas_mix = "n2=23;o2=14"
initial_gas_mix = "n2=23;o2=14";
name = "elevator flooring"
},
/area/awaymission/caves/BMP_asteroid)
"fW" = (
@@ -2169,8 +2169,8 @@
/obj/effect/baseturf_helper/lava,
/turf/open/lava/smooth{
desc = "Looks hot.";
luminosity = 5;
initial_gas_mix = "n2=23;o2=14"
initial_gas_mix = "n2=23;o2=14";
luminosity = 5
},
/area/awaymission/caves/BMP_asteroid/level_four)
"gZ" = (
@@ -208,8 +208,8 @@
"aX" = (
/obj/machinery/porta_turret{
dir = 8;
set_obj_flags = "EMAGGED";
installation = /obj/item/gun/energy/lasercannon
installation = /obj/item/gun/energy/lasercannon;
set_obj_flags = "EMAGGED"
},
/turf/open/floor/plating/airless,
/area/awaymission/challenge/main)
@@ -354,8 +354,8 @@
"bq" = (
/obj/machinery/porta_turret{
dir = 8;
set_obj_flags = "EMAGGED";
installation = /obj/item/gun/energy/lasercannon
installation = /obj/item/gun/energy/lasercannon;
set_obj_flags = "EMAGGED"
},
/turf/open/floor/plating,
/area/awaymission/challenge/main)
File diff suppressed because it is too large Load Diff
+14 -14
View File
@@ -3162,10 +3162,10 @@
/obj/effect/mob_spawn/human/doctor{
brute_damage = 145;
id_job = "Geneticist";
name = "Geneticist";
oxy_damage = 55;
suit = /obj/item/clothing/suit/toggle/labcoat/genetics;
uniform = /obj/item/clothing/under/rank/medical/geneticist;
name = "Geneticist"
uniform = /obj/item/clothing/under/rank/medical/geneticist
},
/obj/effect/decal/cleanable/blood,
/obj/effect/turf_decal/tile/purple{
@@ -4276,10 +4276,10 @@
/obj/effect/mob_spawn/human/doctor{
brute_damage = 145;
id_job = "Geneticist";
name = "Geneticist";
oxy_damage = 55;
suit = /obj/item/clothing/suit/toggle/labcoat/genetics;
uniform = /obj/item/clothing/under/rank/medical/geneticist;
name = "Geneticist"
uniform = /obj/item/clothing/under/rank/medical/geneticist
},
/obj/effect/decal/cleanable/blood,
/obj/effect/turf_decal/tile/purple{
@@ -4724,11 +4724,11 @@
"jp" = (
/obj/structure/barricade/wooden{
desc = "A wooden table hastily flipped over for cover.";
obj_integrity = 55;
icon = 'icons/obj/smooth_structures/wood_table.dmi';
icon_state = "wood_table";
max_integrity = 55;
name = "flipped table"
name = "flipped table";
obj_integrity = 55
},
/turf/open/floor/plasteel/yellowsiding{
dir = 1
@@ -4874,11 +4874,11 @@
"jG" = (
/obj/structure/barricade/wooden{
desc = "A wooden table hastily flipped over for cover.";
obj_integrity = 55;
icon = 'icons/obj/smooth_structures/wood_table.dmi';
icon_state = "wood_table";
max_integrity = 55;
name = "flipped table"
name = "flipped table";
obj_integrity = 55
},
/turf/open/floor/plasteel,
/area/awaymission/research/interior/dorm)
@@ -5051,11 +5051,11 @@
"kb" = (
/obj/structure/barricade/wooden{
desc = "A wooden table hastily flipped over for cover.";
obj_integrity = 55;
icon = 'icons/obj/smooth_structures/wood_table.dmi';
icon_state = "wood_table";
max_integrity = 55;
name = "flipped table"
name = "flipped table";
obj_integrity = 55
},
/turf/open/floor/plasteel/yellowsiding,
/area/awaymission/research/interior/dorm)
@@ -5126,10 +5126,10 @@
/obj/effect/mob_spawn/human/doctor{
brute_damage = 145;
id_job = "Geneticist";
name = "Geneticist";
oxy_damage = 55;
suit = /obj/item/clothing/suit/toggle/labcoat/genetics;
uniform = /obj/item/clothing/under/rank/medical/geneticist;
name = "Geneticist"
uniform = /obj/item/clothing/under/rank/medical/geneticist
},
/obj/effect/decal/cleanable/blood,
/obj/effect/turf_decal/tile/blue{
@@ -6000,10 +6000,10 @@
/obj/effect/mob_spawn/human/doctor{
brute_damage = 145;
id_job = "Geneticist";
name = "Geneticist";
oxy_damage = 55;
suit = /obj/item/clothing/suit/toggle/labcoat/genetics;
uniform = /obj/item/clothing/under/rank/medical/geneticist;
name = "Geneticist"
uniform = /obj/item/clothing/under/rank/medical/geneticist
},
/turf/open/floor/mineral/titanium/blue,
/area/awaymission/research/exterior)
+8 -8
View File
@@ -6699,9 +6699,9 @@
"oo" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4;
piping_layer = 3;
pixel_x = 5;
pixel_y = 5;
piping_layer = 3
pixel_y = 5
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
@@ -6709,9 +6709,9 @@
"op" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4;
piping_layer = 3;
pixel_x = 5;
pixel_y = 5;
piping_layer = 3
pixel_y = 5
},
/turf/open/floor/plasteel,
/area/awaymission/snowdin/post/engineering)
@@ -9713,10 +9713,10 @@
/area/awaymission/snowdin/post/broken_shuttle)
"wc" = (
/obj/machinery/computer{
name = "Shuttle Transist Console";
desc = "A console meant for calling and sending a transit ferry. It seems iced-over and non-functional.";
dir = 1;
icon_screen = null
icon_screen = null;
name = "Shuttle Transist Console"
},
/turf/open/floor/mineral/titanium/blue,
/area/awaymission/snowdin/post/broken_shuttle)
@@ -10657,10 +10657,10 @@
/area/awaymission/snowdin/cave)
"yu" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
name = "toxin out";
dir = 8;
frequency = 1442;
id_tag = "snowdin_toxins_mine_1";
frequency = 1442
name = "toxin out"
},
/turf/open/floor/engine/vacuum,
/area/awaymission/snowdin/cave)
@@ -813,16 +813,16 @@
"bW" = (
/obj/structure/glowshroom/single,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 351.9
},
/area/awaymission/undergroundoutpost45/caves)
"bX" = (
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 351.9
},
@@ -2261,8 +2261,8 @@
/area/awaymission/undergroundoutpost45/central)
"eJ" = (
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -2632,8 +2632,8 @@
dir = 8
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -2868,8 +2868,8 @@
dir = 1
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -3047,8 +3047,8 @@
"gf" = (
/obj/structure/glowshroom/single,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -3195,8 +3195,8 @@
"gB" = (
/obj/machinery/light/small,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -3409,8 +3409,8 @@
dir = 8
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -3420,8 +3420,8 @@
dir = 4
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -3452,8 +3452,8 @@
dir = 8
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -4787,8 +4787,8 @@
"jL" = (
/obj/machinery/light/small,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -4821,8 +4821,8 @@
"jP" = (
/obj/machinery/light/small,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -6604,8 +6604,8 @@
dir = 1
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -8354,8 +8354,8 @@
dir = 6
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -8365,8 +8365,8 @@
dir = 4
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -8377,8 +8377,8 @@
dir = 4
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -8470,8 +8470,8 @@
name = "air out"
},
/turf/open/floor/engine{
name = "air floor";
initial_gas_mix = "n2=10580;o2=2644"
initial_gas_mix = "n2=10580;o2=2644";
name = "air floor"
},
/area/awaymission/undergroundoutpost45/engineering)
"pF" = (
@@ -8668,8 +8668,8 @@
"qa" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -8743,8 +8743,8 @@
dir = 10
},
/turf/open/floor/plasteel/dark{
name = "Server Walkway";
initial_gas_mix = "n2=500,TEMP=80"
initial_gas_mix = "n2=500,TEMP=80";
name = "Server Walkway"
},
/area/awaymission/undergroundoutpost45/research)
"qj" = (
@@ -8900,8 +8900,8 @@
dir = 4
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -8911,8 +8911,8 @@
dir = 1
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -8922,8 +8922,8 @@
dir = 9
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -9126,8 +9126,8 @@
dir = 8
},
/turf/open/floor/plasteel/dark{
name = "Server Walkway";
initial_gas_mix = "n2=500,TEMP=80"
initial_gas_mix = "n2=500,TEMP=80";
name = "Server Walkway"
},
/area/awaymission/undergroundoutpost45/research)
"qR" = (
@@ -9545,8 +9545,8 @@
dir = 9
},
/turf/open/floor/plasteel/dark{
name = "Server Walkway";
initial_gas_mix = "n2=500,TEMP=80"
initial_gas_mix = "n2=500,TEMP=80";
name = "Server Walkway"
},
/area/awaymission/undergroundoutpost45/research)
"rA" = (
@@ -11104,8 +11104,8 @@
dir = 1
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -11750,8 +11750,8 @@
dir = 4
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -11976,8 +11976,8 @@
dir = 1
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -12262,8 +12262,8 @@
dir = 8
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13481,8 +13481,8 @@
dir = 1
},
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13490,8 +13490,8 @@
"yh" = (
/obj/structure/ore_box,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13499,8 +13499,8 @@
"yi" = (
/obj/structure/closet/crate,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13510,8 +13510,8 @@
/obj/structure/bed/nest,
/obj/effect/mob_spawn/human,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13520,8 +13520,8 @@
/obj/structure/alien/weeds,
/obj/structure/bed/nest,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13531,8 +13531,8 @@
/obj/structure/glowshroom/single,
/obj/effect/decal/cleanable/blood/gibs/down,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13541,8 +13541,8 @@
/obj/structure/alien/weeds,
/obj/effect/decal/cleanable/blood/gibs/core,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13550,8 +13550,8 @@
"yn" = (
/obj/structure/alien/weeds,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13560,8 +13560,8 @@
/obj/structure/alien/weeds,
/obj/structure/alien/resin/wall,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13570,8 +13570,8 @@
/obj/structure/alien/weeds,
/obj/effect/mob_spawn/human,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13579,8 +13579,8 @@
"yq" = (
/obj/effect/decal/cleanable/blood/splatter,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13588,8 +13588,8 @@
"yr" = (
/obj/effect/decal/cleanable/blood/gibs/up,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13598,8 +13598,8 @@
/obj/structure/alien/weeds,
/obj/structure/glowshroom/single,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13608,8 +13608,8 @@
/obj/structure/alien/resin/wall,
/obj/structure/alien/weeds,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13618,8 +13618,8 @@
/obj/structure/alien/weeds,
/obj/effect/decal/cleanable/blood/splatter,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13627,8 +13627,8 @@
"yz" = (
/obj/structure/alien/resin/membrane,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13637,8 +13637,8 @@
/obj/structure/alien/weeds,
/obj/effect/decal/cleanable/blood/gibs/down,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13646,8 +13646,8 @@
"yB" = (
/obj/effect/decal/cleanable/blood/gibs/limb,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13656,8 +13656,8 @@
/obj/effect/decal/cleanable/blood/splatter,
/obj/effect/mob_spawn/human,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13667,8 +13667,8 @@
/obj/effect/decal/cleanable/blood/splatter,
/obj/effect/mob_spawn/human,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -13678,8 +13678,8 @@
/obj/effect/decal/cleanable/blood/gibs/down,
/obj/effect/mob_spawn/human,
/turf/open/floor/plating/asteroid{
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
heat_capacity = 1e+006;
initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
File diff suppressed because it is too large Load Diff
+19 -18
View File
@@ -1000,7 +1000,7 @@
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/hos)
"act" = (
/obj/machinery/holopad,
/obj/machinery/holopad/secure,
/turf/open/floor/carpet,
/area/crew_quarters/heads/hos)
"acu" = (
@@ -3551,7 +3551,7 @@
/turf/open/floor/plasteel,
/area/security/brig)
"agU" = (
/obj/machinery/holopad,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"agV" = (
@@ -19903,7 +19903,6 @@
/turf/open/floor/plasteel,
/area/bridge)
"aVk" = (
/obj/machinery/holopad,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -19913,6 +19912,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/holopad,
/turf/open/floor/plasteel,
/area/bridge)
"aVl" = (
@@ -22726,10 +22726,10 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai_upload)
"bcf" = (
/obj/machinery/holopad,
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai_upload)
"bcg" = (
@@ -23322,10 +23322,10 @@
/turf/open/floor/mineral/titanium/blue,
/area/crew_quarters/toilet/locker)
"bdK" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/holopad/secure,
/turf/open/floor/carpet,
/area/bridge/meeting_room)
"bdL" = (
@@ -24223,6 +24223,7 @@
/obj/effect/turf_decal/tile/purple{
dir = 8
},
/obj/machinery/lapvend,
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
"bgb" = (
@@ -24557,10 +24558,10 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/holopad,
/obj/structure/cable{
icon_state = "2-8"
},
/obj/machinery/holopad/secure,
/turf/open/floor/wood,
/area/crew_quarters/heads/captain)
"bgX" = (
@@ -28662,7 +28663,7 @@
/turf/open/floor/plasteel,
/area/crew_quarters/heads/hop)
"bqB" = (
/obj/machinery/holopad,
/obj/machinery/holopad/secure,
/turf/open/floor/carpet,
/area/crew_quarters/heads/hop)
"bqC" = (
@@ -32045,7 +32046,7 @@
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/heads/hor)
"byr" = (
/obj/machinery/holopad,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/white,
/area/crew_quarters/heads/hor)
"bys" = (
@@ -32135,13 +32136,13 @@
/turf/open/floor/plasteel,
/area/quartermaster/qm)
"byC" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/tile/brown{
dir = 1
},
/obj/effect/turf_decal/tile/brown{
dir = 4
},
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel,
/area/quartermaster/qm)
"byD" = (
@@ -35876,13 +35877,13 @@
/turf/open/floor/engine,
/area/science/storage)
"bGZ" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/heads/cmo)
"bHa" = (
@@ -40809,8 +40810,8 @@
/turf/open/floor/plasteel,
/area/security/checkpoint/engineering)
"bTI" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel,
/area/tcommsat/computer)
"bTJ" = (
@@ -45387,7 +45388,6 @@
name = "Privacy Shutters Control";
pixel_y = 26
},
/obj/machinery/holopad,
/obj/machinery/light{
dir = 1
},
@@ -45401,6 +45401,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/chief)
"cfI" = (
@@ -49628,12 +49629,12 @@
/turf/open/floor/plasteel/grimy,
/area/ai_monitored/turret_protected/aisat_interior)
"ctJ" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable{
icon_state = "2-8"
},
/obj/effect/landmark/start/cyborg,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/grimy,
/area/ai_monitored/turret_protected/aisat_interior)
"ctK" = (
@@ -50018,9 +50019,9 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat/atmos)
"cuC" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/landmark/start/cyborg,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat/atmos)
"cuD" = (
@@ -50075,12 +50076,12 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/effect/landmark/start/cyborg,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"cuH" = (
@@ -50106,10 +50107,10 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat/service)
"cuJ" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat/service)
"cuK" = (
@@ -50676,8 +50677,8 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat/hallway)
"cvU" = (
@@ -50932,10 +50933,10 @@
/obj/structure/cable{
icon_state = "2-8"
},
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai)
"cwB" = (
File diff suppressed because it is too large Load Diff
+30 -30
View File
@@ -2425,8 +2425,8 @@
"go" = (
/obj/machinery/camera/autoname,
/obj/structure/railing{
icon_state = "railing";
dir = 8
dir = 8;
icon_state = "railing"
},
/turf/open/floor/grass,
/area/hydroponics/garden/monastery)
@@ -2572,8 +2572,8 @@
"gO" = (
/obj/machinery/space_heater,
/obj/structure/railing/corner{
icon_state = "railing_corner";
dir = 8
dir = 8;
icon_state = "railing_corner"
},
/turf/open/floor/plating,
/area/maintenance/central)
@@ -5594,8 +5594,8 @@
/area/maintenance/solars/starboard)
"oy" = (
/obj/structure/railing{
icon_state = "railing";
dir = 4
dir = 4;
icon_state = "railing"
},
/turf/open/floor/plating,
/area/maintenance/central)
@@ -7058,8 +7058,8 @@
/area/hydroponics)
"sn" = (
/obj/structure/railing/corner{
icon_state = "railing_corner";
dir = 8
dir = 8;
icon_state = "railing_corner"
},
/turf/open/floor/plating,
/area/maintenance/central)
@@ -7083,8 +7083,8 @@
/area/asteroid/nearstation)
"sr" = (
/obj/structure/railing/corner{
icon_state = "railing_corner";
dir = 4
dir = 4;
icon_state = "railing_corner"
},
/turf/open/floor/grass,
/area/hydroponics/garden/monastery)
@@ -12130,8 +12130,8 @@
/area/hallway/secondary/service)
"Fw" = (
/obj/structure/railing{
icon_state = "railing";
dir = 8
dir = 8;
icon_state = "railing"
},
/turf/open/floor/plating,
/area/maintenance/central)
@@ -13656,8 +13656,8 @@
/area/janitor)
"IY" = (
/obj/structure/railing{
icon_state = "railing";
dir = 8
dir = 8;
icon_state = "railing"
},
/obj/structure/cable{
icon_state = "1-2"
@@ -14004,8 +14004,8 @@
/area/vacant_room/commissary)
"JT" = (
/obj/docking_port/stationary/public_mining_dock{
icon_state = "pinonfar";
dir = 2
dir = 2;
icon_state = "pinonfar"
},
/turf/open/floor/plating,
/area/construction/mining/aux_base)
@@ -14423,8 +14423,8 @@
/area/crew_quarters/kitchen)
"KX" = (
/obj/structure/railing/corner{
icon_state = "railing_corner";
dir = 1
dir = 1;
icon_state = "railing_corner"
},
/turf/open/floor/grass,
/area/hydroponics/garden/monastery)
@@ -14469,8 +14469,8 @@
/area/hallway/secondary/service)
"Le" = (
/obj/structure/railing{
icon_state = "railing";
dir = 5
dir = 5;
icon_state = "railing"
},
/turf/open/floor/grass,
/area/hydroponics/garden/monastery)
@@ -14493,8 +14493,8 @@
/area/crew_quarters/fitness/recreation)
"Lg" = (
/obj/structure/railing{
icon_state = "railing";
dir = 8
dir = 8;
icon_state = "railing"
},
/obj/machinery/power/apc{
areastring = "/area/hallway/secondary/construction";
@@ -15478,8 +15478,8 @@
/area/maintenance/department/crew_quarters/dorms)
"NG" = (
/obj/structure/railing{
icon_state = "railing";
dir = 9
dir = 9;
icon_state = "railing"
},
/turf/open/floor/grass,
/area/hydroponics/garden/monastery)
@@ -16723,8 +16723,8 @@
/area/crew_quarters/fitness/recreation)
"QT" = (
/obj/structure/railing{
icon_state = "railing";
dir = 8
dir = 8;
icon_state = "railing"
},
/turf/open/floor/grass,
/area/hydroponics/garden/monastery)
@@ -16896,8 +16896,8 @@
/area/gateway)
"Rx" = (
/obj/structure/railing/corner{
icon_state = "railing_corner";
dir = 8
dir = 8;
icon_state = "railing_corner"
},
/turf/open/floor/grass,
/area/hydroponics/garden/monastery)
@@ -16929,8 +16929,8 @@
/area/gateway)
"RA" = (
/obj/structure/railing{
icon_state = "railing";
dir = 4
dir = 4;
icon_state = "railing"
},
/turf/open/floor/grass,
/area/hydroponics/garden/monastery)
+66 -66
View File
@@ -61,16 +61,16 @@
"n" = (
/obj/effect/landmark/mafia,
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 9
dir = 9;
icon_state = "trimline_fill"
},
/obj/effect/turf_decal/trimline/brown/filled/corner,
/turf/open/floor/plasteel,
/area/mafia)
"o" = (
/obj/effect/turf_decal/trimline/brown/filled/end{
icon_state = "trimline_end_fill";
dir = 4
dir = 4;
icon_state = "trimline_end_fill"
},
/obj/structure/closet{
desc = "It's a storage unit. For mining stuff. Y'know.";
@@ -94,8 +94,8 @@
/area/mafia)
"r" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 9
dir = 9;
icon_state = "trimline_fill"
},
/obj/structure/closet{
desc = "It's a storage unit. For mining stuff. Y'know.";
@@ -107,8 +107,8 @@
/area/mafia)
"s" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 9
dir = 9;
icon_state = "trimline_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
@@ -134,31 +134,31 @@
/area/mafia)
"w" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 1
dir = 1;
icon_state = "trimline_fill"
},
/obj/effect/turf_decal/trimline/brown/filled/corner,
/turf/open/floor/plasteel,
/area/mafia)
"x" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 1
dir = 1;
icon_state = "trimline_fill"
},
/obj/effect/turf_decal/trimline/brown/filled/line,
/turf/open/floor/plasteel,
/area/mafia)
"y" = (
/obj/effect/turf_decal/trimline/brown/filled/end{
icon_state = "trimline_end_fill";
dir = 4
dir = 4;
icon_state = "trimline_end_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
"z" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 5
dir = 5;
icon_state = "trimline_fill"
},
/obj/structure/closet{
desc = "It's a storage unit. For mining stuff. Y'know.";
@@ -171,70 +171,70 @@
"A" = (
/obj/effect/landmark/mafia,
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 6
dir = 6;
icon_state = "trimline_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
"B" = (
/obj/effect/turf_decal/trimline/brown/filled/end{
icon_state = "trimline_end_fill";
dir = 1
dir = 1;
icon_state = "trimline_end_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
"C" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 4
dir = 4;
icon_state = "trimline_fill"
},
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 8
dir = 8;
icon_state = "trimline_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
"D" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 10
dir = 10;
icon_state = "trimline_fill"
},
/obj/effect/turf_decal/trimline/brown/filled/corner{
icon_state = "trimline_corner_fill";
dir = 4
dir = 4;
icon_state = "trimline_corner_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
"E" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 1
dir = 1;
icon_state = "trimline_fill"
},
/obj/effect/turf_decal/trimline/brown/filled/corner{
icon_state = "trimline_corner_fill";
dir = 8
dir = 8;
icon_state = "trimline_corner_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
"F" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 5
dir = 5;
icon_state = "trimline_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
"G" = (
/obj/effect/landmark/mafia,
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 10
dir = 10;
icon_state = "trimline_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
"H" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 10
dir = 10;
icon_state = "trimline_fill"
},
/obj/structure/closet{
desc = "It's a storage unit. For mining stuff. Y'know.";
@@ -246,8 +246,8 @@
/area/mafia)
"I" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 6
dir = 6;
icon_state = "trimline_fill"
},
/obj/structure/closet{
desc = "It's a storage unit. For mining stuff. Y'know.";
@@ -260,19 +260,19 @@
"J" = (
/obj/effect/landmark/mafia,
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 6
dir = 6;
icon_state = "trimline_fill"
},
/obj/effect/turf_decal/trimline/brown/filled/corner{
icon_state = "trimline_corner_fill";
dir = 1
dir = 1;
icon_state = "trimline_corner_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
"K" = (
/obj/effect/turf_decal/trimline/brown/filled/end{
icon_state = "trimline_end_fill";
dir = 8
dir = 8;
icon_state = "trimline_end_fill"
},
/obj/structure/closet{
desc = "It's a storage unit. For mining stuff. Y'know.";
@@ -285,34 +285,34 @@
"L" = (
/obj/effect/landmark/mafia,
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 5
dir = 5;
icon_state = "trimline_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
"M" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 10
dir = 10;
icon_state = "trimline_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
"N" = (
/obj/effect/turf_decal/trimline/brown/filled/line,
/obj/effect/turf_decal/trimline/brown/filled/corner{
icon_state = "trimline_corner_fill";
dir = 4
dir = 4;
icon_state = "trimline_corner_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
"O" = (
/obj/effect/turf_decal/trimline/brown/filled/corner{
icon_state = "trimline_corner_fill";
dir = 8
dir = 8;
icon_state = "trimline_corner_fill"
},
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 5
dir = 5;
icon_state = "trimline_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
@@ -323,8 +323,8 @@
"Q" = (
/obj/effect/landmark/mafia,
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 9
dir = 9;
icon_state = "trimline_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
@@ -345,31 +345,31 @@
/area/mafia)
"S" = (
/obj/effect/turf_decal/trimline/brown/filled/end{
icon_state = "trimline_end_fill";
dir = 8
dir = 8;
icon_state = "trimline_end_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
"T" = (
/obj/effect/turf_decal/trimline/brown/filled/line,
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 1
dir = 1;
icon_state = "trimline_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
"U" = (
/obj/effect/turf_decal/trimline/brown/filled/line,
/obj/effect/turf_decal/trimline/brown/filled/corner{
icon_state = "trimline_corner_fill";
dir = 1
dir = 1;
icon_state = "trimline_corner_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
"V" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
icon_state = "trimline_fill";
dir = 6
dir = 6;
icon_state = "trimline_fill"
},
/turf/open/floor/plasteel,
/area/mafia)
+2 -2
View File
@@ -62,8 +62,8 @@
/area/mafia)
"n" = (
/obj/structure/chair/brass{
icon_state = "brass_chair";
dir = 1
dir = 1;
icon_state = "brass_chair"
},
/turf/open/floor/clockwork/reebe,
/area/mafia)
+74 -129
View File
@@ -3710,7 +3710,6 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"agS" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -3721,6 +3720,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"agT" = (
@@ -3795,11 +3795,11 @@
/turf/open/floor/carpet,
/area/crew_quarters/heads/hos)
"agZ" = (
/obj/machinery/holopad,
/obj/structure/chair{
dir = 1
},
/obj/effect/landmark/start/head_of_security,
/obj/machinery/holopad/secure,
/turf/open/floor/carpet,
/area/crew_quarters/heads/hos)
"aha" = (
@@ -9617,8 +9617,8 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
},
/obj/machinery/holopad,
/obj/effect/turf_decal/stripes/line,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"arR" = (
@@ -13304,13 +13304,6 @@
/obj/structure/lattice/catwalk,
/turf/open/space,
/area/space/nearstation)
"aze" = (
/obj/item/kirbyplants{
icon_state = "plant-22"
},
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/wood,
/area/library)
"azg" = (
/obj/item/stack/cable_coil,
/turf/open/floor/plating/airless,
@@ -14062,18 +14055,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall/r_wall,
/area/engine/engineering)
"aAz" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
/obj/machinery/computer/security/telescreen/entertainment{
pixel_y = 30
},
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/plasteel/cult,
/area/library)
"aAA" = (
/obj/docking_port/stationary{
dir = 8;
@@ -14907,6 +14888,12 @@
},
/turf/open/floor/plasteel/dark,
/area/security/nuke_storage)
"aCi" = (
/obj/structure/sign/painting/library{
pixel_y = 32
},
/turf/open/floor/wood,
/area/library)
"aCj" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security/glass{
@@ -16576,14 +16563,17 @@
/turf/open/floor/engine,
/area/engine/engineering)
"aFE" = (
/obj/structure/table/wood,
/obj/machinery/newscaster{
pixel_y = 32
/obj/structure/table/wood/fancy/blue,
/obj/structure/table/wood/fancy/royalblue,
/obj/structure/sign/painting/library_secure{
pixel_x = 32
},
/obj/item/folder,
/obj/item/folder,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/plasteel/cult,
/obj/machinery/door/window{
dir = 8;
name = "Secure Art Exhibition";
req_access_txt = "37"
},
/turf/open/floor/wood,
/area/library)
"aFF" = (
/obj/structure/table,
@@ -20575,7 +20565,7 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai_upload)
"aOc" = (
/obj/machinery/holopad,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai_upload)
"aOd" = (
@@ -21700,7 +21690,7 @@
/area/quartermaster/qm)
"aQs" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/holopad,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel,
/area/quartermaster/qm)
"aQt" = (
@@ -25578,7 +25568,7 @@
dir = 1;
pixel_y = 1
},
/obj/machinery/holopad,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/aisat)
"aYe" = (
@@ -27503,7 +27493,6 @@
/turf/open/floor/plasteel,
/area/crew_quarters/heads/chief)
"bbv" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -27514,6 +27503,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel,
/area/crew_quarters/heads/chief)
"bbw" = (
@@ -30698,7 +30688,6 @@
/obj/structure/window/reinforced{
dir = 8
},
/obj/machinery/holopad,
/turf/open/floor/wood,
/area/crew_quarters/heads/captain/private)
"bhz" = (
@@ -31161,8 +31150,8 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai)
"bip" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai)
"biq" = (
@@ -33899,12 +33888,12 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"bnC" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/effect/landmark/start/cyborg,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"bnD" = (
@@ -34887,11 +34876,11 @@
/turf/open/floor/plasteel/dark,
/area/aisat)
"bpF" = (
/obj/machinery/holopad,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/aisat)
"bpG" = (
@@ -34937,8 +34926,8 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/holopad,
/obj/item/beacon,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat/foyer)
"bpL" = (
@@ -36523,16 +36512,6 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"bsI" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/structure/extinguisher_cabinet{
pixel_y = -30
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"bsJ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -37489,9 +37468,9 @@
/turf/open/floor/wood,
/area/crew_quarters/heads/captain/private)
"buG" = (
/obj/machinery/holopad{
pixel_x = 9;
pixel_y = -9
/obj/machinery/holopad/secure{
pixel_x = 15;
pixel_y = -15
},
/turf/open/floor/carpet,
/area/crew_quarters/heads/captain/private)
@@ -38069,32 +38048,12 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/carpet,
/area/library)
"bwe" = (
/obj/structure/chair/comfy/black{
dir = 8
"bwf" = (
/obj/machinery/light{
dir = 1
},
/turf/open/floor/wood,
/area/library)
"bwf" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
},
/obj/machinery/computer/security/telescreen/entertainment{
pixel_y = 30
},
/turf/open/floor/plasteel/cult,
/area/library)
"bwg" = (
/obj/structure/table/wood,
/obj/machinery/newscaster{
pixel_y = 32
},
/obj/item/folder,
/obj/item/folder,
/turf/open/floor/plasteel/cult,
/area/library)
"bwh" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/extinguisher_cabinet{
@@ -38943,14 +38902,19 @@
/obj/effect/landmark/start/librarian,
/turf/open/floor/wood,
/area/library)
"bxW" = (
/turf/open/floor/plasteel/cult,
/area/library)
"bxX" = (
/obj/structure/chair/comfy/brown{
dir = 1
/obj/structure/table/wood/fancy/blue,
/obj/structure/table/wood/fancy/royalblue,
/obj/structure/sign/painting/library_secure{
pixel_x = 32
},
/turf/open/floor/plasteel/cult,
/obj/machinery/door/window{
dir = 8;
name = "Secure Art Exhibition";
req_access_txt = "37"
},
/obj/structure/window/reinforced/spawner,
/turf/open/floor/wood,
/area/library)
"bxY" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -39670,7 +39634,6 @@
/turf/open/floor/plasteel/grimy,
/area/tcommsat/computer)
"bzq" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -39681,6 +39644,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/grimy,
/area/tcommsat/computer)
"bzr" = (
@@ -39797,18 +39761,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/carpet,
/area/library)
"bzG" = (
/obj/machinery/door/morgue{
name = "Study #1"
},
/turf/open/floor/plasteel/cult,
/area/library)
"bzH" = (
/obj/machinery/door/morgue{
name = "Study #2"
},
/turf/open/floor/plasteel/cult,
/area/library)
"bzI" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/light{
@@ -40511,9 +40463,6 @@
/area/engine/atmos)
"bBu" = (
/obj/machinery/vending/coffee,
/obj/machinery/newscaster{
pixel_y = 32
},
/turf/open/floor/wood,
/area/library)
"bBv" = (
@@ -40525,12 +40474,6 @@
/obj/machinery/bookbinder,
/turf/open/floor/wood,
/area/library)
"bBx" = (
/obj/item/kirbyplants{
icon_state = "plant-22"
},
/turf/open/floor/wood,
/area/library)
"bBy" = (
/obj/structure/sign/directions/command{
dir = 4;
@@ -43456,13 +43399,13 @@
/turf/open/floor/plasteel/dark/telecomms,
/area/tcommsat/server)
"bHE" = (
/obj/machinery/holopad,
/obj/structure/cable/yellow{
icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark/telecomms,
/area/tcommsat/server)
"bHF" = (
@@ -58787,7 +58730,7 @@
/area/science/explab)
"cmX" = (
/obj/structure/window/reinforced,
/obj/machinery/holopad,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/aisat)
"cmY" = (
@@ -61251,13 +61194,13 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/holopad,
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/heads/cmo)
"crA" = (
@@ -63638,7 +63581,7 @@
},
/area/crew_quarters/heads/hor)
"cvU" = (
/obj/machinery/holopad,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/cafeteria{
dir = 5
},
@@ -75899,9 +75842,6 @@
/obj/machinery/light{
dir = 1
},
/obj/machinery/status_display/evac{
pixel_y = 30
},
/obj/machinery/photocopier{
pixel_y = 3
},
@@ -81614,6 +81554,12 @@
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"iAG" = (
/obj/structure/sign/painting/library{
pixel_y = -32
},
/turf/open/floor/wood,
/area/library)
"iCn" = (
/obj/machinery/vr_sleeper,
/turf/open/floor/plasteel,
@@ -82628,12 +82574,11 @@
/turf/open/floor/plasteel/dark,
/area/crew_quarters/fitness/recreation)
"qBh" = (
/obj/structure/table,
/obj/item/paicard,
/obj/effect/turf_decal/tile/purple,
/obj/effect/turf_decal/tile/purple{
dir = 8
},
/obj/machinery/lapvend,
/turf/open/floor/plasteel/white,
/area/science/research)
"qBq" = (
@@ -103714,8 +103659,8 @@ bnV
bql
awL
bue
aze
bwe
bzE
bzE
bGv
bHT
bwc
@@ -103971,8 +103916,8 @@ bod
bql
bsG
bue
bue
bue
aCi
iAG
bue
bBu
bwc
@@ -104228,9 +104173,9 @@ boe
bql
bsH
bue
aAz
bxW
bzG
aCi
iAG
bue
bzE
bwc
bEA
@@ -104485,8 +104430,8 @@ bof
bqu
bsz
bue
bwg
bxX
aCi
iAG
bue
bBv
bwc
@@ -104740,10 +104685,10 @@ bku
bml
bog
bqv
bsI
bue
bue
bsz
bue
aCi
iAG
bue
cUT
bwc
@@ -105000,8 +104945,8 @@ bqw
bsx
bue
bwf
bxW
bzH
bzE
bzE
bzE
dCX
bwc
@@ -105258,11 +105203,11 @@ bsx
bue
aFE
bxX
bue
bzE
bzE
bwc
bwc
bBw
bwc
bwc
bBx
bue
bue
bue
@@ -3,9 +3,9 @@
/turf/open/space/basic,
/area/space)
"aab" = (
/obj/machinery/holopad,
/obj/effect/landmark/start/cyborg,
/mob/living/simple_animal/bot/secbot/pingsky,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"aac" = (
@@ -999,7 +999,7 @@
/obj/machinery/power/terminal{
dir = 1
},
/obj/machinery/holopad,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/white,
/area/ai_monitored/turret_protected/ai)
"acs" = (
@@ -11793,7 +11793,7 @@
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/captain)
"aBn" = (
/obj/machinery/holopad,
/obj/machinery/holopad/secure,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/captain)
"aBo" = (
@@ -12592,7 +12592,7 @@
/turf/open/floor/wood,
/area/crew_quarters/heads/hop)
"aCR" = (
/obj/machinery/holopad,
/obj/machinery/holopad/secure,
/turf/open/floor/wood,
/area/crew_quarters/heads/hop)
"aCS" = (
@@ -12995,7 +12995,6 @@
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai_upload)
"aDM" = (
/obj/machinery/holopad,
/obj/machinery/camera/motion{
c_tag = "AI Upload Center";
dir = 1;
@@ -13008,6 +13007,7 @@
name = "Station Intercom (AI Private)";
pixel_y = -28
},
/obj/machinery/holopad/secure,
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai_upload)
"aDN" = (
+30 -30
View File
@@ -435,8 +435,8 @@
/area/engine/atmos)
"bm" = (
/obj/machinery/atmospherics/components/binary/valve/on{
icon_state = "mvalve_map-2";
dir = 4
dir = 4;
icon_state = "mvalve_map-2"
},
/turf/open/floor/plating,
/area/engine/atmos)
@@ -1502,8 +1502,8 @@
/area/engine/storage)
"gK" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
icon_state = "connector_map-2";
dir = 8
dir = 8;
icon_state = "connector_map-2"
},
/obj/machinery/portable_atmospherics/canister/toxins,
/turf/open/floor/plating,
@@ -1514,8 +1514,8 @@
/area/hallway/secondary/service)
"hi" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/on{
icon_state = "inje_map-2";
dir = 4
dir = 4;
icon_state = "inje_map-2"
},
/turf/open/floor/plating,
/area/construction)
@@ -1555,8 +1555,8 @@
/area/hallway/secondary/service)
"jA" = (
/obj/effect/turf_decal/stripes/white/line{
icon_state = "warningline_white";
dir = 8
dir = 8;
icon_state = "warningline_white"
},
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -1567,8 +1567,8 @@
/area/construction)
"jV" = (
/obj/effect/turf_decal/stripes/white/line{
icon_state = "warningline_white";
dir = 6
dir = 6;
icon_state = "warningline_white"
},
/turf/open/floor/plating,
/area/engine/storage)
@@ -1637,8 +1637,8 @@
/area/engine/storage)
"qR" = (
/obj/effect/turf_decal/stripes/white/line{
icon_state = "warningline_white";
dir = 9
dir = 9;
icon_state = "warningline_white"
},
/turf/open/floor/plating,
/area/engine/storage)
@@ -1659,15 +1659,15 @@
/area/construction)
"sE" = (
/obj/effect/turf_decal/stripes/white/line{
icon_state = "warningline_white";
dir = 4
dir = 4;
icon_state = "warningline_white"
},
/turf/open/floor/plating,
/area/engine/storage)
"td" = (
/obj/effect/turf_decal/stripes/white/line{
icon_state = "warningline_white";
dir = 8
dir = 8;
icon_state = "warningline_white"
},
/turf/open/floor/plating,
/area/engine/storage)
@@ -1704,8 +1704,8 @@
/area/construction)
"xB" = (
/obj/effect/turf_decal/stripes/white/line{
icon_state = "warningline_white";
dir = 1
dir = 1;
icon_state = "warningline_white"
},
/turf/open/floor/plating,
/area/engine/storage)
@@ -1720,8 +1720,8 @@
/area/construction)
"zZ" = (
/obj/structure/disposalpipe/trunk{
icon_state = "pipe-t";
dir = 1
dir = 1;
icon_state = "pipe-t"
},
/obj/machinery/disposal/bin,
/turf/open/floor/plating,
@@ -1788,12 +1788,12 @@
/area/construction)
"EH" = (
/obj/effect/turf_decal/stripes/white/line{
icon_state = "warningline_white";
dir = 1
dir = 1;
icon_state = "warningline_white"
},
/obj/effect/turf_decal/stripes/white/line{
icon_state = "warningline_white";
dir = 4
dir = 4;
icon_state = "warningline_white"
},
/turf/open/floor/plating,
/area/engine/storage)
@@ -1804,8 +1804,8 @@
"FL" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/green/hidden{
icon_state = "pipe11-2";
dir = 4
dir = 4;
icon_state = "pipe11-2"
},
/turf/open/floor/plating,
/area/construction)
@@ -1896,8 +1896,8 @@
/area/engine/storage)
"Qo" = (
/obj/structure/disposalpipe/trunk/multiz/down{
icon_state = "pipe-down";
dir = 1
dir = 1;
icon_state = "pipe-down"
},
/turf/open/floor/plating,
/area/hallway/secondary/service)
@@ -1966,8 +1966,8 @@
/area/construction)
"ZQ" = (
/obj/effect/turf_decal/stripes/white/line{
icon_state = "warningline_white";
dir = 5
dir = 5;
icon_state = "warningline_white"
},
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
+6 -6
View File
@@ -1407,8 +1407,8 @@
height = 5;
id = "laborcamp_home";
name = "fore bay 1";
width = 9;
roundstart_template = /datum/map_template/shuttle/labour/box
roundstart_template = /datum/map_template/shuttle/labour/box;
width = 9
},
/turf/open/space/basic,
/area/space)
@@ -1419,8 +1419,8 @@
height = 15;
id = "arrivals_stationary";
name = "arrivals";
width = 7;
roundstart_template = /datum/map_template/shuttle/arrival/box
roundstart_template = /datum/map_template/shuttle/arrival/box;
width = 7
},
/turf/open/space/basic,
/area/space)
@@ -2325,8 +2325,8 @@
height = 5;
id = "mining_home";
name = "mining shuttle bay";
width = 7;
roundstart_template = /datum/map_template/shuttle/mining/box
roundstart_template = /datum/map_template/shuttle/mining/box;
width = 7
},
/turf/open/space/basic,
/area/space)
+2 -2
View File
@@ -9,9 +9,9 @@
dwidth = 11;
height = 22;
id = "whiteship_away";
json_key = "whiteship";
name = "Deep Space";
width = 35;
json_key = "whiteship"
width = 35
},
/turf/open/space,
/area/space)
+16 -16
View File
@@ -75,8 +75,8 @@
},
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/arrows{
icon_state = "arrows";
dir = 1
dir = 1;
icon_state = "arrows"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -112,8 +112,8 @@
/area/shuttle/arrival)
"n" = (
/obj/structure/shuttle/engine/propulsion/left{
icon_state = "propulsion_l";
dir = 8
dir = 8;
icon_state = "propulsion_l"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -124,8 +124,8 @@
/obj/structure/window/shuttle,
/obj/structure/grille,
/obj/structure/shuttle/engine/heater{
icon_state = "heater";
dir = 8
dir = 8;
icon_state = "heater"
},
/turf/open/floor/plating,
/area/shuttle/arrival)
@@ -143,8 +143,8 @@
},
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/arrows{
icon_state = "arrows";
dir = 1
dir = 1;
icon_state = "arrows"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -157,8 +157,8 @@
},
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/arrows{
icon_state = "arrows";
dir = 1
dir = 1;
icon_state = "arrows"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -194,8 +194,8 @@
/area/shuttle/arrival)
"u" = (
/obj/structure/shuttle/engine/propulsion{
icon_state = "propulsion";
dir = 8
dir = 8;
icon_state = "propulsion"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -237,8 +237,8 @@
pixel_x = 28
},
/obj/effect/turf_decal/arrows{
icon_state = "arrows";
dir = 1
dir = 1;
icon_state = "arrows"
},
/obj/effect/turf_decal/stripes/corner,
/obj/effect/turf_decal/stripes/corner{
@@ -327,8 +327,8 @@
/area/shuttle/arrival)
"G" = (
/obj/structure/shuttle/engine/propulsion/right{
icon_state = "propulsion_r";
dir = 8
dir = 8;
icon_state = "propulsion_r"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
+2 -2
View File
@@ -198,9 +198,9 @@
dir = 8;
dwidth = 6;
height = 18;
name = "Birdboat emergency escape shuttle";
port_direction = 4;
width = 14;
name = "Birdboat emergency escape shuttle"
width = 14
},
/obj/structure/fans/tiny,
/turf/open/floor/mineral/titanium,
+2 -2
View File
@@ -545,9 +545,9 @@
dwidth = 11;
height = 18;
name = "Delta emergency shuttle";
width = 30;
port_direction = 4;
preferred_direction = 2;
port_direction = 4
width = 30
},
/obj/structure/fans/tiny,
/turf/open/floor/plating,
+3 -3
View File
@@ -19,10 +19,10 @@
name = "Escape Pod Airlock"
},
/obj/docking_port/mobile/pod{
port_direction = 2;
dwidth = 1;
width = 3;
height = 4
height = 4;
port_direction = 2;
width = 3
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
+4 -4
View File
@@ -4,8 +4,8 @@
/area/shuttle/labor)
"b" = (
/obj/structure/shuttle/engine/propulsion{
icon_state = "propulsion";
dir = 1
dir = 1;
icon_state = "propulsion"
},
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -14,8 +14,8 @@
/area/shuttle/labor)
"c" = (
/obj/structure/shuttle/engine/heater{
icon_state = "heater";
dir = 1
dir = 1;
icon_state = "heater"
},
/obj/structure/window/reinforced,
/obj/effect/turf_decal/stripes/line{
+4 -4
View File
@@ -86,8 +86,8 @@
width = 7
},
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 8
dir = 8;
icon_state = "pipe11-2"
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/mining)
@@ -115,8 +115,8 @@
"p" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/simple/general/hidden{
icon_state = "pipe11-2";
dir = 8
dir = 8;
icon_state = "pipe11-2"
},
/obj/effect/turf_decal/stripes/corner{
dir = 8
+4 -1
View File
@@ -87,12 +87,15 @@
//Don't set this very much higher then 1024 unless you like inviting people in to dos your server with message spam
#define MAX_MESSAGE_LEN 4096 //Citadel edit: What's the WORST that could happen?
#define MAX_FLAVOR_LEN 4096
#define MAX_FLAVOR_LEN 4096
#define MAX_TASTE_LEN 40 //lick... vore... ew...
#define MAX_NAME_LEN 42
#define MAX_BROADCAST_LEN 512
#define MAX_CHARTER_LEN 80
// Is something in the IC chat filter? This is config dependent.
#define CHAT_FILTER_CHECK(T) (config.ic_filter_regex && findtext(T, config.ic_filter_regex))
// Audio/Visual Flags. Used to determine what sense are required to notice a message.
#define MSG_VISUAL (1<<0)
#define MSG_AUDIBLE (1<<1)
@@ -22,7 +22,7 @@
var/motd
// var/policy
// var/static/regex/ic_filter_regex
var/static/regex/ic_filter_regex
/datum/controller/configuration/proc/admin_reload()
if(IsAdminAdvancedProcCall())
@@ -53,7 +53,7 @@
loadmaplist(CONFIG_MAPS_FILE)
LoadMOTD()
// LoadPolicy()
// LoadChatFilter()
LoadChatFilter()
if (Master)
Master.OnConfigLoad()
@@ -486,7 +486,7 @@ Example config:
continue
runnable_modes[M] = probabilities[M.config_tag]
return runnable_modes
/*
/datum/controller/configuration/proc/LoadChatFilter()
var/list/in_character_filter = list()
if(!fexists("[directory]/in_character_filter.txt"))
@@ -499,7 +499,7 @@ Example config:
continue
in_character_filter += REGEX_QUOTE(line)
ic_filter_regex = in_character_filter.len ? regex("\\b([jointext(in_character_filter, "|")])\\b", "i") : null
*/
//Message admins when you can.
/datum/controller/configuration/proc/DelayedMessageAdmins(text)
addtimer(CALLBACK(GLOBAL_PROC, /proc/message_admins, text), 0)
+3 -3
View File
@@ -79,7 +79,7 @@ GLOBAL_LIST_EMPTY(network_holopads)
var/secure = FALSE
/// If we are currently calling another holopad
var/calling = FALSE
/*
/obj/machinery/holopad/secure
name = "secure holopad"
desc = "It's a floor-mounted device for projecting holographic images. This one will refuse to auto-connect incoming calls."
@@ -90,7 +90,7 @@ GLOBAL_LIST_EMPTY(network_holopads)
var/obj/item/circuitboard/machine/holopad/board = circuit
board.secure = TRUE
board.build_path = /obj/machinery/holopad/secure
*/
/obj/machinery/holopad/tutorial
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
flags_1 = NODECONSTRUCT_1
@@ -372,7 +372,7 @@ GLOBAL_LIST_EMPTY(network_holopads)
if(force_answer_call && world.time > (HC.call_start_time + (HOLOPAD_MAX_DIAL_TIME / 2)))
HC.Answer(src)
break
if(!secure) //HC.head_call &&
if(HC.head_call && !secure)
HC.Answer(src)
break
if(outgoing_call)
+3
View File
@@ -16,6 +16,9 @@
if(isopenturf(target))
deploy_bodybag(user, target)
/obj/item/bodybag/canReachInto(atom/user, atom/target, list/next, view_only, obj/item/tool)
return (user in src)
/obj/item/bodybag/proc/deploy_bodybag(mob/user, atom/location)
var/obj/structure/closet/body_bag/R = new unfoldedbag_path(location)
R.open(user)
@@ -472,7 +472,7 @@
build_path = /obj/machinery/holopad
secure = FALSE
else
build_path = /obj/machinery/holopad //secure
build_path = /obj/machinery/holopad/secure //secure
secure = TRUE
to_chat(user, "<span class='notice'>You [secure? "en" : "dis"]able the security on the [src]</span>")
. = ..()
@@ -582,7 +582,7 @@
T1.visible_message("<span class='warning'>[user] dives into [src]!</span>")
/obj/structure/closet/canReachInto(atom/user, atom/target, list/next, view_only, obj/item/tool)
return ..() && opened
return (user in src)
/// cit specific ///
@@ -676,7 +676,6 @@
ADD_TRAIT(new_spawn, TRAIT_SIXTHSENSE, GHOSTROLE_TRAIT)
ADD_TRAIT(new_spawn, TRAIT_EXEMPT_HEALTH_EVENTS, GHOSTROLE_TRAIT)
ADD_TRAIT(new_spawn, TRAIT_NO_MIDROUND_ANTAG, GHOSTROLE_TRAIT) //The mob can't be made into a random antag, they are still eligible for ghost roles popups.
ADD_TRAIT(new_spawn, TRAIT_PACIFISM, GHOSTROLE_TRAIT)
to_chat(new_spawn,"<span class='boldwarning'>Ghosting is free!</span>")
var/datum/action/toggle_dead_chat_mob/D = new(new_spawn)
D.Grant(new_spawn)
@@ -125,6 +125,8 @@
/datum/antagonist/changeling/proc/remove_changeling_powers()
if(ishuman(owner.current) || ismonkey(owner.current))
reset_properties()
QDEL_NULL(cellular_emporium)
QDEL_NULL(emporium_action)
for(var/obj/effect/proc_holder/changeling/p in purchasedpowers)
if(p.always_keep)
continue
@@ -139,6 +141,7 @@
/datum/antagonist/changeling/proc/reset_powers()
if(purchasedpowers)
remove_changeling_powers()
create_actions()
//Repurchase free powers.
for(var/path in all_powers)
var/obj/effect/proc_holder/changeling/S = new path()
@@ -225,7 +228,8 @@
/datum/antagonist/changeling/proc/regenerate()
var/mob/living/carbon/the_ling = owner.current
if(istype(the_ling))
emporium_action.Grant(the_ling)
if(emporium_action)
emporium_action.Grant(the_ling)
if(the_ling.stat == DEAD)
chem_charges = min(max(0, chem_charges + chem_recharge_rate - chem_recharge_slowdown), (chem_storage*0.5))
geneticdamage = max(LING_DEAD_GENETICDAMAGE_HEAL_CAP,geneticdamage-1)
@@ -11,6 +11,14 @@
//Revive from revival stasis
/obj/effect/proc_holder/changeling/revive/sting_action(mob/living/carbon/user)
var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling)
if(!changeling)
return
if(changeling.hostile_absorbed)
to_chat(user, "<span class='notice'>We cannot muster up the strength to revive ourselves!</span>")
changeling.purchasedpowers -= src
src.action.Remove(user)
return
user.cure_fakedeath("changeling")
user.revive(full_heal = 1)
var/list/missing = user.get_missing_limbs()
@@ -27,7 +35,6 @@
user.regenerate_limbs(0, list(BODY_ZONE_HEAD))
user.regenerate_organs()
to_chat(user, "<span class='notice'>We have revived ourselves.</span>")
var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling)
changeling.purchasedpowers -= src
src.action.Remove(user)
return TRUE
+19 -3
View File
@@ -13,11 +13,27 @@
var/power = 2000
/datum/round_event/supermatter_surge/setup()
power = rand(200,4000)
if(prob(70))
power = rand(200,100000)
else
power = rand(200,200000)
/datum/round_event/supermatter_surge/announce()
if(power > 800 || prob(round(power/8)))
priority_announce("Class [round(power/500) + 1] supermatter surge detected. Intervention may be required.", "Anomaly Alert")
var/severity = ""
switch(power)
if(-INFINITY to 100000)
var/low_threat_perc = 100-round(100*((power-200)/(100000-200)))
if(prob(low_threat_perc))
if(prob(low_threat_perc))
severity = "low; the supermatter should return to normal operation shortly."
else
severity = "medium; the supermatter should return to normal operation, but check NT CIMS to ensure this."
else
severity = "high; if the supermatter's cooling is not fortified, coolant may need to be added."
if(100000 to INFINITY)
severity = "extreme; emergency action is likely to be required even if coolant loop is fine."
if(power > 20000 || prob(round(power/200)))
priority_announce("Supermatter surge detected. Estimated severity is [severity]", "Anomaly Alert")
/datum/round_event/supermatter_surge/start()
GLOB.main_supermatter_engine.matter_power += power
@@ -1285,8 +1285,8 @@
if(isliving(target) && chaser_timer <= world.time) //living and chasers off cooldown? fire one!
chaser_timer = world.time + chaser_cooldown
var/obj/effect/temp_visual/hierophant/chaser/C = new(get_turf(user), user, target, chaser_speed, friendly_fire_check)
C.damage = 30
C.monster_damage_boost = FALSE
C.damage = 15
C.monster_damage_boost = TRUE
log_combat(user, target, "fired a chaser at", src)
else
INVOKE_ASYNC(src, .proc/cardinal_blasts, T, user) //otherwise, just do cardinal blast
@@ -1402,10 +1402,10 @@
new /obj/effect/temp_visual/hierophant/telegraph/teleport(source, user)
for(var/t in RANGE_TURFS(1, T))
var/obj/effect/temp_visual/hierophant/blast/B = new /obj/effect/temp_visual/hierophant/blast(t, user, TRUE) //blasts produced will not hurt allies
B.damage = 30
B.damage = 15
for(var/t in RANGE_TURFS(1, source))
var/obj/effect/temp_visual/hierophant/blast/B = new /obj/effect/temp_visual/hierophant/blast(t, user, TRUE) //but absolutely will hurt enemies
B.damage = 30
B.damage = 15
for(var/mob/living/L in range(1, source))
INVOKE_ASYNC(src, .proc/teleport_mob, source, L, T, user) //regardless, take all mobs near us along
sleep(6) //at this point the blasts detonate
@@ -1466,8 +1466,8 @@
if(!J)
return
var/obj/effect/temp_visual/hierophant/blast/B = new(J, user, friendly_fire_check)
B.damage = 30
B.monster_damage_boost = FALSE
B.damage = 15
B.monster_damage_boost = TRUE
previousturf = J
J = get_step(previousturf, dir)
@@ -1479,7 +1479,7 @@
sleep(2)
for(var/t in RANGE_TURFS(1, T))
var/obj/effect/temp_visual/hierophant/blast/B = new(t, user, friendly_fire_check)
B.damage = 15 //keeps monster damage boost due to lower damage
B.damage = 15 //keeps monster damage boost due to lower damage (now added to all damage due to reduction to 15, 30dmg 50AP isn't cool)
//Just some minor stuff
@@ -37,11 +37,11 @@
to_chat(owner, "There's something stuck to your hand, stopping you from transforming!")
return
if(IsAvailable())
transforming = TRUE
UpdateButtonIcon()
var/mutcolor = owner.get_ability_property(INNATE_ABILITY_SLIME_BLOBFORM, PROPERTY_BLOBFORM_COLOR) || ("#" + H.dna.features["mcolor"])
if(!is_puddle)
if(CHECK_MOBILITY(H, MOBILITY_USE)) //if we can use items, we can turn into a puddle
transforming = TRUE
is_puddle = TRUE //so we know which transformation to use when its used
ADD_TRAIT(H, TRAIT_HUMAN_NO_RENDER, SLIMEPUDDLE_TRAIT)
owner.cut_overlays() //we dont show our normal sprite, we show a puddle sprite
@@ -3,7 +3,7 @@
id = SPECIES_VAMPIRE
default_color = "FFFFFF"
species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,DRINKSBLOOD,HAS_FLESH,HAS_BONE)
inherent_traits = list(TRAIT_NOHUNGER,TRAIT_NOBREATH)
inherent_traits = list(TRAIT_NOHUNGER,TRAIT_NOBREATH,TRAIT_NOMARROW)
inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID
mutant_bodyparts = list("mcolor" = "FFFFFF", "tail_human" = "None", "ears" = "None", "deco_wings" = "None")
exotic_bloodtype = "U"
@@ -53,10 +53,11 @@
C.adjustOxyLoss(-4)
C.adjustCloneLoss(-4)
return
C.blood_volume -= 0.75 //Will take roughly 19.5 minutes to die from standard blood volume, roughly 83 minutes to die from max blood volume.
if(C.blood_volume <= (BLOOD_VOLUME_SURVIVE*C.blood_ratio))
to_chat(C, "<span class='danger'>You ran out of blood!</span>")
C.dust()
if(C.blood_volume > 0.5)
C.blood_volume -= 0.5 //Will take roughly 19.5 minutes to die from standard blood volume, roughly 83 minutes to die from max blood volume.
else
C.dust(FALSE, TRUE)
var/area/A = get_area(C)
if(istype(A, /area/chapel) && C.mind?.assigned_role != "Chaplain")
to_chat(C, "<span class='danger'>You don't belong here!</span>")
@@ -125,7 +126,7 @@
. = ..()
var/obj/item/organ/heart/vampire/darkheart = getorgan(/obj/item/organ/heart/vampire)
if(darkheart)
. += "<span class='notice'>Current blood level: [blood_volume]/[BLOOD_VOLUME_MAXIMUM].</span>"
. += "Current blood level: [blood_volume]/[BLOOD_VOLUME_MAXIMUM]."
/obj/item/organ/heart/vampire
+5 -4
View File
@@ -90,11 +90,11 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
var/static/list/one_character_prefix = list(MODE_HEADSET = TRUE, MODE_ROBOT = TRUE, MODE_WHISPER = TRUE)
var/ic_blocked = FALSE
/*
if(client && !forced && config.ic_filter_regex && findtext(message, config.ic_filter_regex))
if(client && !forced && CHAT_FILTER_CHECK(message))
//The filter doesn't act on the sanitized message, but the raw message.
ic_blocked = TRUE
*/
if(sanitize)
message = trim(copytext_char(sanitize(message), 1, MAX_MESSAGE_LEN))
if(!message || message == "")
@@ -103,6 +103,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
if(ic_blocked)
//The filter warning message shows the sanitized message though.
to_chat(src, "<span class='warning'>That message contained a word prohibited in IC chat! Consider reviewing the server rules.\n<span replaceRegex='show_filtered_ic_chat'>\"[message]\"</span></span>")
SSblackbox.record_feedback("tally", "ic_blocked_words", 1, lowertext(config.ic_filter_regex.match))
return
var/datum/saymode/saymode = SSradio.saymodes[talk_key]
@@ -333,7 +334,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
var/obj/item/bodypart/rightarm = get_bodypart(BODY_ZONE_R_ARM)
if(HAS_TRAIT(src, TRAIT_MUTE) && get_selected_language() != /datum/language/signlanguage)
return 0
if (get_selected_language() == /datum/language/signlanguage)
var/left_disabled = FALSE
var/right_disabled = FALSE
@@ -9,7 +9,7 @@
build_type = IMPRINTER
materials = list(/datum/material/glass = 1000)
build_path = /obj/item/circuitboard/computer/cargo/express
category = list("Mining Designs")
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_CARGO
/datum/design/bluespace_pod
@@ -19,7 +19,7 @@
build_type = PROTOLATHE
materials = list(/datum/material/glass = 1000)
build_path = /obj/item/disk/cargo/bluespace_pod
category = list("Mining Designs")
category = list("Electronics")
departmental_flags = DEPARTMENTAL_FLAG_CARGO
/datum/design/drill
+47
View File
@@ -50,6 +50,53 @@
-->
<div class="commit sansserif">
<h2 class="date">21 March 2021</h2>
<h3 class="author">Arturlang updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Vampire statpanel no longer shows spans unnecesary</li>
</ul>
<h3 class="author">GrayRachnid updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">fixed the holopad autocall bug</li>
<li class="bugfix">properly incorporated the secure holopad that was commented out in the code.</li>
<li class="config">the in_character_filter.txt is now usable</li>
<li class="admin">headmins should edit the in_character_filter.txt</li>
<li class="server">someone with box access should delete racism with the in_character_filter.txt</li>
<li class="balance">buffed particle defender disabler shots from 13->15 stamina (15*6=90)</li>
<li class="balance">buffed particle defender laser ammo to 4 shots</li>
</ul>
<h3 class="author">Hatterhat updated:</h3>
<ul class="changes bgimages16">
<li class="rscdel">removes pacifism from ghost cafe. have fun beating up your coworkers</li>
</ul>
<h3 class="author">LetterN updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Art gallery (meta)</li>
<li class="rscadd">Laptop vendor (meta, delta, box)</li>
</ul>
<h3 class="author">Putnam3145 updated:</h3>
<ul class="changes bgimages16">
<li class="balance">Buffed supermatter surge massively.</li>
</ul>
<h3 class="author">The-Sun-In-Splendour updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">You cannot revive yourself (as a changeling) if you've been absorbed anymore</li>
</ul>
<h3 class="author">dzahlus updated:</h3>
<ul class="changes bgimages16">
<li class="balance">rebalanced hierophant STAFF to do 15 damage on all attacks</li>
</ul>
<h3 class="author">timothyteakettle updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">using the puddle ability when stunned wont break it</li>
</ul>
<h2 class="date">20 March 2021</h2>
<h3 class="author">Hatterhat updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Bluespace beaker filling icons for that narrow band between 90 and 80% full now actually exist.</li>
</ul>
<h2 class="date">19 March 2021</h2>
<h3 class="author">DeltaFire15 updated:</h3>
<ul class="changes bgimages16">
+29
View File
@@ -28782,3 +28782,32 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
someone.
zeroisthebiggay:
- bugfix: fixes spriteless heretic book
2021-03-20:
Hatterhat:
- bugfix: Bluespace beaker filling icons for that narrow band between 90 and 80%
full now actually exist.
2021-03-21:
Arturlang:
- bugfix: Vampire statpanel no longer shows spans unnecesary
GrayRachnid:
- bugfix: fixed the holopad autocall bug
- bugfix: properly incorporated the secure holopad that was commented out in the
code.
- config: the in_character_filter.txt is now usable
- admin: headmins should edit the in_character_filter.txt
- server: someone with box access should delete racism with the in_character_filter.txt
- balance: buffed particle defender disabler shots from 13->15 stamina (15*6=90)
- balance: buffed particle defender laser ammo to 4 shots
Hatterhat:
- rscdel: removes pacifism from ghost cafe. have fun beating up your coworkers
LetterN:
- rscadd: Art gallery (meta)
- rscadd: Laptop vendor (meta, delta, box)
Putnam3145:
- balance: Buffed supermatter surge massively.
The-Sun-In-Splendour:
- bugfix: You cannot revive yourself (as a changeling) if you've been absorbed anymore
dzahlus:
- balance: rebalanced hierophant STAFF to do 15 damage on all attacks
timothyteakettle:
- bugfix: using the puddle ability when stunned wont break it
Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

@@ -153,7 +153,7 @@
/obj/item/ammo_casing/energy/laser/pump
projectile_type = /obj/item/projectile/beam/pump
e_cost = 350
e_cost = 300
select_name = "kill"
pellets = 6
variance = 15
@@ -189,5 +189,5 @@
name = "disabling blast"
icon_state = "disablerslug"
color = null
stamina = 13
stamina = 15
range = 6
+1 -1
View File
@@ -1,6 +1,6 @@
pygit2==1.0.1
bidict==0.13.1
Pillow==7.2.0
Pillow==8.1.1
# changelogs
PyYaml==5.3.1