Skip to content

Commit

Permalink
Merge pull request #5491 from ARF-SS13/chester
Browse files Browse the repository at this point in the history
Chester and his stairs
  • Loading branch information
Tk420634 authored Oct 16, 2024
2 parents 16055aa + af1f2b6 commit 2f2dfd0
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 7 deletions.
16 changes: 13 additions & 3 deletions _maps/map_files/coyote_bayou/Newboston.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -43380,6 +43380,16 @@
/obj/structure/barricade/wooden/planks/pregame,
/turf/open/floor/plasteel/f13/vault_floor/red/white,
/area/f13/building/coyote/nash/mall/groundfloor)
"xVD" = (
/mob/living/simple_animal/hostile/aethergiest{
name = "Chester";
desc = "A strange aethergiest that seems to only try and chew on peoples hands. Probably someones beloved pet.";
color = "#FF0000"
},
/turf/open/indestructible/ground/outside/road{
color = "#999999"
},
/area/f13/wasteland)
"xVF" = (
/obj/effect/turf_decal/siding/wood/corner{
dir = 8
Expand Down Expand Up @@ -83357,7 +83367,7 @@ ler
ler
ler
ler
ler
xVD
ler
ler
nxi
Expand Down Expand Up @@ -114086,9 +114096,9 @@ hYK
hYK
hYK
dNV
rxd
thz
hYK
hYK
lNo
rND
rrh
Expand Down Expand Up @@ -114543,9 +114553,9 @@ sZq
sZq
hYK
dNV
rxd
pHB
hYK
hYK
rrh
hYK
hYK
Expand Down
4 changes: 2 additions & 2 deletions code/datums/weather/weather_types/acid_rain.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@
C.adjustToxLoss(rand(1, 15))
C.emote("gasp")

/* // Stops weather from cleaning the ground (though it still cleans mobs c:)

/datum/weather/acid_rain/weather_act_turf(turf/T)
SEND_SIGNAL(T, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_MEDIUM)
for(var/obj/effect/O in T)
if(is_cleanable(O))
qdel(O)
for(var/obj/item/ammo_casing/C in T)
qdel(C)
*/

3 changes: 1 addition & 2 deletions code/datums/weather/weather_types/rain.dm
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,14 @@
CHECK_TICK

/datum/weather/rain/weather_act_turf(turf/open/T)
/* // Stops weather from cleaning the ground (though it still cleans mobs c:)
var/cleaned
if(!cleaned)
for(var/obj/effect/decal/O in T) //Clean cleanable decals in affected areas
if(is_cleanable(O))
qdel(O)
cleaned = 1
CHECK_TICK
*/

for(var/obj/effect/decal/cleanable/blood/B in T)
qdel(B)
CHECK_TICK
Expand Down

0 comments on commit 2f2dfd0

Please sign in to comment.