Skip to content

Commit

Permalink
Implementation of weak acid pools/acid pools + sounds
Browse files Browse the repository at this point in the history
  • Loading branch information
quackjack committed Oct 22, 2024
1 parent 96b7be4 commit 3ffee99
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 19 deletions.
39 changes: 22 additions & 17 deletions code/game/turfs/open/lava.dm
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,9 @@

/turf/open/lava/acid
name = "acid"
desc = "Caustic and horrid, it bubbles incessantly."
icon_state = "acid"
slowdown = 8 //caustic cove edit
light_range = 4
light_power = 1
light_color = "#56ff0d"
Expand Down Expand Up @@ -247,25 +249,28 @@
// if(S && H && S.clothing_flags & LAVAPROTECT && H.clothing_flags & LAVAPROTECT)
// return
//make this acid
var/shouldupdate = FALSE
var/lethality = prob(95)
for(var/obj/item/bodypart/B in C.bodyparts)
if(!B.skeletonized && B.is_organic_limb())
B.skeletonize(lethality)
shouldupdate = TRUE
if(!lethality)
ADD_TRAIT(C, TRAIT_NOLIMBDISABLE, "[type]")
if(shouldupdate)
if(ishuman(C))
var/mob/living/carbon/human/H = C
qdel(H.underwear)
C.unequip_everything()
C.update_body()
// var/shouldupdate = FALSE
// var/lethality = prob(95)
// for(var/obj/item/bodypart/B in C.bodyparts)
// if(!B.skeletonized && B.is_organic_limb())
// B.skeletonize(lethality)
// shouldupdate = TRUE
// if(!lethality)
// ADD_TRAIT(C, TRAIT_NOLIMBDISABLE, "[type]")
// if(shouldupdate)
// if(ishuman(C))
// var/mob/living/carbon/human/H = C
// qdel(H.underwear)
// C.unequip_everything()
// C.update_body()
// C.dust(drop_items = TRUE)
continue
// continue

// if("lava" in L.weather_immunities)
// continue

L.dust(drop_items = TRUE)

L.adjustFireLoss(10) //would have higher, but I wanted to give prey their fanservice
playsound(src, 'modular_causticcove/sound/misc/bigmelt.ogg', 100, FALSE)
if(L.health <= 0) //melt away once dead
L.dust(drop_items = TRUE)
playsound(src, 'modular_causticcove/sound/misc/deathdigest.ogg', 100, FALSE) //caustic cove edit end
4 changes: 2 additions & 2 deletions code/game/turfs/open/water.dm
Original file line number Diff line number Diff line change
Expand Up @@ -396,8 +396,8 @@
wash_in = FALSE

/turf/open/water/acid
name = "acid"
desc = "Caustic and horrible, its bubbling incessantly."
name = "diluted acid"
desc = "A foul smelling depth of less-than acid."
icon_state = "acid"
icon = 'icons/turf/roguefloor.dmi'
water_level = 2 //waist high
Expand Down
Binary file added modular_causticcove/sound/misc/bigmelt.ogg
Binary file not shown.
Binary file added modular_causticcove/sound/misc/deathdigest.ogg
Binary file not shown.

0 comments on commit 3ffee99

Please sign in to comment.