cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 08:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix winter woods killing you (#3130)

Browse Source 
## About The Pull Request

Fix the winter woods area because it had some problems, chiefly that it
would kill you as soon as you enter it.

## Why It's Good For The Game

Fixes #3095 

## Proof Of Testing

I forgot to take pics but TRUST ME

## Changelog

🆑
fix: the winter woods dorm no longer kills you immediately
/🆑
This commit is contained in:
Roxy
2025-02-20 11:29:41 -08:00
committed by GitHub
parent d31c2c5c52
commit d3d3f63a58
5 changed files with 62 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_skyrat/modules/ghostcafe/code/ghost_role_spawners.dm
+4 -4
View File
@@ -29,8 +29,8 @@
var/area/A = get_area(src)
//new_spawn.AddElement(/datum/element/ghost_role_eligibility, free_ghosting = TRUE) SKYRAT PORT -- Needs to be completely rewritten
new_spawn.AddElement(/datum/element/dusts_on_catatonia)
new_spawn.AddElement(/datum/element/dusts_on_leaving_area,list(A.type, /area/misc/hilbertshotel, /area/centcom/holding/cafe,
/area/centcom/holding/cafe/vox, /area/centcom/holding/cafe/dorms, /area/centcom/holding/cafe/park))
new_spawn.AddElement(/datum/element/dusts_on_leaving_area,list(A.type, /area/misc/hilbertshotel, /area/misc/hilbertshotel/winterwoods,
/area/centcom/holding/cafe, /area/centcom/holding/cafe/vox, /area/centcom/holding/cafe/dorms, /area/centcom/holding/cafe/park))
ADD_TRAIT(new_spawn, TRAIT_SIXTHSENSE, TRAIT_GHOSTROLE)
ADD_TRAIT(new_spawn, TRAIT_FREE_GHOST, TRAIT_GHOSTROLE)
to_chat(new_spawn,span_warning("<b>Ghosting is free!</b>"))
@@ -58,8 +58,8 @@
if(new_spawn.client)
var/area/A = get_area(src)
new_spawn.AddElement(/datum/element/dusts_on_catatonia)
new_spawn.AddElement(/datum/element/dusts_on_leaving_area,list(A.type, /area/misc/hilbertshotel, /area/centcom/holding/cafe,
/area/centcom/holding/cafe/vox, /area/centcom/holding/cafe/dorms, /area/centcom/holding/cafe/park))
new_spawn.AddElement(/datum/element/dusts_on_leaving_area,list(A.type, /area/misc/hilbertshotel, /area/misc/hilbertshotel/winterwoods,
/area/centcom/holding/cafe, /area/centcom/holding/cafe/vox, /area/centcom/holding/cafe/dorms, /area/centcom/holding/cafe/park))
ADD_TRAIT(new_spawn, TRAIT_SIXTHSENSE, TRAIT_GHOSTROLE)
ADD_TRAIT(new_spawn, TRAIT_FREE_GHOST, TRAIT_GHOSTROLE)
to_chat(new_spawn,span_warning("<b>Ghosting is free!</b>"))
modular_skyrat/modules/ghostcafe/code/hilbertshotel_ghost.dm
+2 -12
View File
@@ -37,19 +37,9 @@
name = "Winter Woods"
mappath = "modular_skyrat/modules/hotel_rooms/winterwoods.dmm"
/area/misc/winterwoods
/area/misc/hilbertshotel/winterwoods
name = "Winter Woods"
icon = 'icons/area/areas_ruins.dmi'
icon_state = "hilbertshotel"
requires_power = FALSE
has_gravity = TRUE
area_flags = NOTELEPORT | HIDDEN_AREA
static_lighting = TRUE
ambientsounds = "icemoon"
var/roomnumber = 0
var/obj/item/hilbertshotel/parentSphere
var/datum/turf_reservation/reservation
var/turf/storageTurf
ambientsounds = AMBIENCE_ICEMOON
/datum/map_template/ghost_cafe_rooms/evacuationstation
name = "Evacuated Station"
modular_skyrat/modules/hotel_rooms/winterwoods.dmm
+54 -54
View File
@@ -1,13 +1,13 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aj" = (
/turf/open/floor/wood/tile,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"aI" = (
/obj/structure/flora/bush/snow/style_random,
/mob/living/basic/pet/penguin/baby/permanent/snowdin,
/obj/effect/overlay/light_snow,
/turf/open/floor/fake_snow/safe,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"aL" = (
/obj/effect/turf_decal/siding/wood{
dir = 1
@@ -21,7 +21,7 @@
pixel_y = 9
},
/turf/open/floor/wood/tile,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"by" = (
/obj/structure/flora/bush/snow/style_4,
/obj/effect/turf_decal/weather/snow/corner{
@@ -29,18 +29,18 @@
},
/obj/effect/overlay/light_snow,
/turf/open/floor/fake_snow/safe,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"cg" = (
/obj/structure/railing/wooden_fencing{
dir = 4
},
/obj/effect/overlay/light_snow,
/turf/open/floor/fake_snow/safe,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"cI" = (
/obj/structure/sign/flag/nri,
/turf/closed/indestructible/wood,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"de" = (
/obj/structure/fireplace,
/obj/effect/turf_decal/siding/wood{
@@ -50,7 +50,7 @@
dir = 8
},
/turf/open/floor/wood/tile,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"eh" = (
/obj/structure/closet/crate/wooden,
/obj/item/clothing/suit/modern_winter,
@@ -70,17 +70,17 @@
/obj/effect/overlay/light_snow,
/obj/item/gun/ballistic/revolver/nagant,
/turf/open/floor/fake_snow/safe,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"es" = (
/obj/item/grown/log/tree,
/obj/effect/overlay/light_snow,
/turf/open/floor/fake_snow/safe,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"fQ" = (
/obj/effect/turf_decal/weather/snow/corner,
/obj/effect/overlay/light_snow,
/turf/open/floor/fake_snow/safe,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"fS" = (
/obj/structure/chair/wood{
dir = 4
@@ -90,12 +90,12 @@
},
/obj/effect/turf_decal/siding/wood,
/turf/open/floor/wood/tile,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"gD" = (
/obj/effect/turf_decal/weather/snow/corner,
/obj/effect/overlay/light_snow,
/turf/closed/indestructible/rock/snow/ice/ore,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"ht" = (
/obj/effect/turf_decal/siding/wood{
dir = 8
@@ -108,7 +108,7 @@
},
/obj/item/toy/plush/skyrat/snow_owl,
/turf/open/floor/wood/tile,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"kv" = (
/obj/structure/chair/sofa/bench/left{
dir = 4;
@@ -117,18 +117,18 @@
},
/obj/effect/overlay/light_snow,
/turf/open/floor/fake_snow/safe,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"lf" = (
/obj/effect/overlay/light_snow,
/obj/structure/flora/bush/snow/style_4,
/obj/structure/flora/tree/pine,
/turf/open/floor/fake_snow/safe,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"mU" = (
/obj/effect/overlay/light_snow,
/obj/structure/flora/bush/snow/style_4,
/turf/open/floor/fake_snow/safe,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"pI" = (
/obj/structure/table/wood/shuttle_bar,
/obj/effect/turf_decal/siding/wood,
@@ -153,15 +153,15 @@
pixel_y = 8
},
/turf/open/floor/wood/tile,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"rB" = (
/turf/closed/indestructible/rock/snow/ice/ore,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"tT" = (
/obj/structure/flora/bush/snow/style_random,
/obj/effect/overlay/light_snow,
/turf/open/floor/fake_snow/safe,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"ua" = (
/obj/effect/turf_decal/siding/wood{
dir = 1
@@ -183,84 +183,84 @@
},
/obj/structure/rack/wooden,
/turf/open/floor/wood/tile,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"uY" = (
/obj/item/wisp_lantern,
/obj/effect/overlay/light_snow,
/turf/open/floor/fake_snow/safe,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"wq" = (
/obj/effect/overlay/light_snow,
/obj/effect/decal/remains/plasma,
/turf/open/floor/fakeice/slippery,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"wr" = (
/obj/structure/flora/tree/dead/style_random,
/obj/effect/overlay/light_snow,
/turf/open/floor/fake_snow/safe,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"wK" = (
/obj/effect/spawner/structure/window/ice,
/obj/structure/barricade/wooden/crude/snow,
/obj/structure/curtain/bounty/start_closed,
/turf/open/floor/fake_snow/safe,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"xR" = (
/obj/structure/flora/tree/pine/style_random,
/obj/effect/overlay/light_snow,
/turf/open/floor/fake_snow/safe,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"yd" = (
/obj/effect/overlay/light_snow,
/turf/open/floor/fake_snow/safe,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"yf" = (
/obj/effect/overlay/light_snow,
/obj/structure/flora/tree/dead/style_random,
/turf/open/floor/fake_snow/safe,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"AG" = (
/turf/closed/indestructible/wood,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"AY" = (
/obj/structure/flora/grass/both/style_random,
/obj/effect/overlay/light_snow,
/turf/open/floor/fake_snow/safe,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"Cs" = (
/obj/effect/overlay/light_snow,
/obj/structure/flora/tree/pine,
/turf/open/floor/fake_snow/safe,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"CC" = (
/obj/effect/overlay/light_snow,
/turf/open/lava/plasma/biodome,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"Dx" = (
/obj/effect/overlay/light_snow,
/obj/structure/flora/grass/both/style_random,
/turf/open/floor/fake_snow/safe,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"EN" = (
/obj/effect/overlay/light_snow,
/turf/open/floor/fakeice/slippery,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"ET" = (
/obj/structure/barricade/wooden/snowed,
/turf/open/floor/fake_snow/safe,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"FP" = (
/obj/effect/turf_decal/siding/wood{
dir = 8
},
/turf/open/floor/wood/tile,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"Hg" = (
/obj/effect/turf_decal/weather/snow/corner,
/obj/effect/overlay/light_snow,
/obj/structure/statue/snow/snowman,
/turf/open/floor/fake_snow/safe,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"HG" = (
/obj/structure/chair/wood/wings{
dir = 8
@@ -270,66 +270,66 @@
dir = 4
},
/turf/open/floor/wood/tile,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"Jn" = (
/obj/structure/sign/poster/contraband/soviet_propaganda,
/turf/closed/indestructible/wood,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"Jv" = (
/obj/effect/overlay/light_snow,
/turf/open/floor/plating/snowed/smoothed{
planetary_atmos = 0
},
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"KZ" = (
/obj/structure/mineral_door/wood,
/obj/effect/turf_decal/weather/snow,
/turf/open/floor/fake_snow/safe,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"Lw" = (
/obj/effect/overlay/light_snow,
/turf/closed/indestructible/rock/snow/ice/ore,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"Mr" = (
/obj/effect/turf_decal/weather/snow,
/obj/effect/overlay/light_snow,
/turf/open/misc/dirt/jungle,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"MJ" = (
/obj/structure/flora/tree/pine,
/obj/effect/overlay/light_snow,
/turf/open/floor/fake_snow/safe,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"Nh" = (
/obj/effect/spawner/structure/window/ice,
/obj/structure/barricade/wooden/crude/snow,
/turf/open/floor/fake_snow/safe,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"No" = (
/obj/effect/turf_decal/weather/snow/corner,
/obj/effect/overlay/light_snow,
/turf/open/floor/plating/snowed/smoothed{
planetary_atmos = 0
},
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"OB" = (
/obj/structure/bonfire/prelit,
/obj/effect/turf_decal/weather/snow,
/obj/effect/overlay/light_snow,
/turf/open/misc/dirt/jungle,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"OH" = (
/mob/living/basic/pet/penguin/baby/permanent/snowdin,
/obj/effect/overlay/light_snow,
/turf/open/floor/fake_snow/safe,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"ON" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 8
},
/obj/effect/overlay/light_snow,
/turf/open/floor/fake_snow/safe,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"Qb" = (
/obj/structure/railing/wooden_fencing{
dir = 4
@@ -337,24 +337,24 @@
/obj/structure/railing/wooden_fencing,
/obj/effect/overlay/light_snow,
/turf/open/floor/fake_snow/safe,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"Tt" = (
/obj/structure/flora/grass/both/style_random,
/obj/effect/turf_decal/weather/snow/corner,
/obj/effect/overlay/light_snow,
/turf/open/floor/fake_snow/safe,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"Ve" = (
/obj/structure/barricade/wooden/snowed,
/obj/effect/overlay/light_snow,
/turf/open/floor/fake_snow/safe,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"Yk" = (
/turf/closed/indestructible/hoteldoor{
icon_state = "door_closed";
icon = 'icons/obj/doors/puzzledoor/default.dmi'
},
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"YY" = (
/obj/structure/chair/sofa/bench/right{
dir = 4;
@@ -364,13 +364,13 @@
/obj/structure/railing/wooden_fencing,
/obj/effect/overlay/light_snow,
/turf/open/floor/fake_snow/safe,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
"ZK" = (
/obj/effect/turf_decal/siding/wood{
dir = 4
},
/turf/open/floor/wood/tile,
/area/misc/winterwoods)
/area/misc/hilbertshotel/winterwoods)
(1,1,1) = {"
rB
modular_zubbers/code/game/objects/effects/overlays.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/obj/effect/overlay/light_snow
gender = PLURAL
name = "snowfall"
icon = 'icons/effects/effects.dmi'
icon = 'icons/effects/weather_effects.dmi'
icon_state = "light_snow"
anchored = TRUE
tgstation.dme
+1
View File
@@ -8798,6 +8798,7 @@
#include "modular_zubbers\code\game\machinery\doors\firedoor.dm"
#include "modular_zubbers\code\game\machinery\pipe\construction.dm"
#include "modular_zubbers\code\game\objects\effects\landmarks.dm"
#include "modular_zubbers\code\game\objects\effects\overlays.dm"
#include "modular_zubbers\code\game\objects\effects\decals\cleanable.dm"
#include "modular_zubbers\code\game\objects\effects\effects_system\effect_sparks.dm"
#include "modular_zubbers\code\game\objects\effects\items\plushes.dm"