Add cabin area to avoid the alarm locking the entire biodome
Prevent crowbarring lubed tiles in clown planet
Added a few walls to prevent the disposal entrance immediately throwing
you into lava
This commit is contained in:
datlo
2019-08-27 14:34:27 +02:00
parent 708e591365
commit 068b997eb6
5 changed files with 58 additions and 28 deletions
@@ -1153,6 +1153,13 @@
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/floor/noslip/lavaland,
/area/ruin/powered/clownplanet)
"VH" = (
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
/turf/simulated/wall/r_wall,
/area/ruin/powered/clownplanet)
"Xm" = (
/obj/item/clothing/head/cone,
/obj/effect/mapping_helpers/no_lava,
@@ -1287,9 +1294,9 @@ cc
ye
ye
ye
ad
ab
aA
ad
ab
aA
ye
cc
@@ -1320,8 +1327,8 @@ cc
ye
ye
ab
au
aE
ch
VH
aH
ay
aS
@@ -76,36 +76,36 @@
/area/ruin/powered/snow_biodome)
"aq" = (
/turf/simulated/wall/mineral/wood,
/area/ruin/powered/snow_biodome)
/area/ruin/powered/snow_cabin)
"ar" = (
/obj/machinery/door/airlock/wood,
/turf/simulated/floor/plating,
/area/ruin/powered/snow_biodome)
/area/ruin/powered/snow_cabin)
"as" = (
/obj/structure/fans,
/turf/simulated/wall/mineral/wood,
/area/ruin/powered/snow_biodome)
/area/ruin/powered/snow_cabin)
"at" = (
/turf/simulated/floor/wood,
/area/ruin/powered/snow_biodome)
/area/ruin/powered/snow_cabin)
"au" = (
/obj/structure/bed,
/obj/item/bedsheet/blue,
/turf/simulated/floor/wood,
/area/ruin/powered/snow_biodome)
/area/ruin/powered/snow_cabin)
"av" = (
/obj/structure/bookcase/random,
/turf/simulated/floor/wood,
/area/ruin/powered/snow_biodome)
/area/ruin/powered/snow_cabin)
"aw" = (
/obj/structure/table/wood,
/turf/simulated/floor/wood,
/area/ruin/powered/snow_biodome)
/area/ruin/powered/snow_cabin)
"ax" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/beans,
/turf/simulated/floor/wood,
/area/ruin/powered/snow_biodome)
/area/ruin/powered/snow_cabin)
"ay" = (
/obj/structure/closet/crate/trashcart,
/obj/item/trash/semki,
@@ -121,7 +121,7 @@
dir = 4
},
/turf/simulated/floor/wood,
/area/ruin/powered/snow_biodome)
/area/ruin/powered/snow_cabin)
"aB" = (
/obj/structure/flora/rock/pile/icy,
/turf/simulated/floor/plating/asteroid/snow/atmosphere,
@@ -133,26 +133,26 @@
"aD" = (
/obj/machinery/door/airlock/wood,
/turf/simulated/floor/wood,
/area/ruin/powered/snow_biodome)
/area/ruin/powered/snow_cabin)
"aE" = (
/obj/structure/extinguisher_cabinet,
/turf/simulated/wall/mineral/wood,
/area/ruin/powered/snow_biodome)
/area/ruin/powered/snow_cabin)
"aF" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/drinks/h_chocolate,
/turf/simulated/floor/wood,
/area/ruin/powered/snow_biodome)
/area/ruin/powered/snow_cabin)
"aG" = (
/obj/structure/chair/comfy/brown{
dir = 8
},
/turf/simulated/floor/wood,
/area/ruin/powered/snow_biodome)
/area/ruin/powered/snow_cabin)
"aH" = (
/mob/living/simple_animal/hostile/skeleton/eskimo,
/turf/simulated/floor/wood,
/area/ruin/powered/snow_biodome)
/area/ruin/powered/snow_cabin)
"aI" = (
/obj/structure/flora/bush,
/turf/simulated/floor/plating/asteroid/snow/atmosphere,
@@ -165,18 +165,18 @@
/obj/structure/table/wood,
/obj/item/key/snowmobile,
/turf/simulated/floor/wood,
/area/ruin/powered/snow_biodome)
/area/ruin/powered/snow_cabin)
"aL" = (
/obj/structure/displaycase/lavaland_winter,
/turf/simulated/floor/wood,
/area/ruin/powered/snow_biodome)
/area/ruin/powered/snow_cabin)
"aM" = (
/turf/simulated/floor/carpet,
/area/ruin/powered/snow_biodome)
/area/ruin/powered/snow_cabin)
"aN" = (
/obj/structure/bed/dogbed,
/turf/simulated/floor/wood,
/area/ruin/powered/snow_biodome)
/area/ruin/powered/snow_cabin)
"aO" = (
/obj/machinery/door/airlock/multi_tile/glass,
/obj/structure/fans/tiny,
@@ -194,6 +194,10 @@
/obj/structure/flora/tree/pine/xmas,
/turf/simulated/floor/plating/asteroid/snow/atmosphere,
/area/ruin/powered/snow_biodome)
"bi" = (
/obj/structure/fans/tiny,
/turf/simulated/floor/pod/dark,
/area/ruin/powered/snow_cabin)
"bl" = (
/turf/simulated/floor/wood/cold,
/area/ruin/powered/snow_biodome)
@@ -208,13 +212,13 @@
dir = 8
},
/turf/simulated/floor/wood,
/area/ruin/powered/snow_biodome)
/area/ruin/powered/snow_cabin)
"bx" = (
/obj/machinery/light{
dir = 4
},
/turf/simulated/floor/wood,
/area/ruin/powered/snow_biodome)
/area/ruin/powered/snow_cabin)
"by" = (
/obj/machinery/light{
dir = 8
@@ -224,7 +228,7 @@
"bz" = (
/obj/machinery/light,
/turf/simulated/floor/wood,
/area/ruin/powered/snow_biodome)
/area/ruin/powered/snow_cabin)
"bB" = (
/obj/machinery/light{
dir = 4
@@ -288,6 +292,11 @@
"tl" = (
/turf/simulated/floor/pod/light,
/area/ruin/powered/snow_biodome)
"vf" = (
/obj/machinery/door/airlock/multi_tile/glass,
/obj/structure/fans/tiny,
/turf/simulated/floor/pod/dark,
/area/ruin/powered/snow_cabin)
"xU" = (
/obj/item/storage/toolbox/mechanical,
/turf/simulated/floor/pod/dark,
@@ -851,7 +860,7 @@ at
at
aH
aM
aO
vf
ap
ak
ak
@@ -883,7 +892,7 @@ aA
aA
at
aM
aP
bi
ak
ak
aQ
+3
View File
@@ -12,6 +12,9 @@
/area/ruin/powered/snow_biodome
icon_state = "dk_yellow"
/area/ruin/powered/snow_cabin
icon_state = "bar"
/area/ruin/powered/gluttony
icon_state = "dk_yellow"
+5 -1
View File
@@ -178,7 +178,11 @@
. = ..()
MakeSlippery(TURF_WET_LUBE, TRUE)
/turf/simulated/floor/mineral/bananium/lubed/pry_tile() //I want to get off Mr Honk's Wild Ride
/turf/simulated/floor/mineral/bananium/lubed/pry_tile(obj/item/C, mob/user, silent = FALSE) //I want to get off Mr Honk's Wild Ride
if(ishuman(user))
var/mob/living/carbon/human/H = user
to_chat(H, "<span class='warning'>You lose your footing trying to pry off the tile!</span>")
H.slip("the floor", 0, 5, tilesSlipped = 4, walkSafely = 0, slipAny = 1)
return
//TRANQUILLITE
@@ -120,6 +120,13 @@
. = ..()
MakeSlippery(TURF_WET_LUBE, TRUE)
/turf/simulated/floor/lubed/pry_tile(obj/item/C, mob/user, silent = FALSE) //I want to get off Mr Honk's Wild Ride
if(ishuman(user))
var/mob/living/carbon/human/H = user
to_chat(H, "<span class='warning'>You lose your footing trying to pry off the tile!</span>")
H.slip("the floor", 0, 5, tilesSlipped = 4, walkSafely = 0, slipAny = 1)
return
//Clockwork floor: Slowly heals toxin damage on nearby servants.
/turf/simulated/floor/clockwork
name = "clockwork floor"