Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)

This commit is contained in:
SandPoot
2022-04-09 00:03:13 -03:00
428 changed files with 8031 additions and 7608 deletions
+1 -1
View File
@@ -130,7 +130,7 @@
H.visible_message("<span class='danger'>[H] falls in and takes a drink!</span>",
"<span class='userdanger'>You fall in and swallow some water!</span>")
playsound(src, 'sound/effects/splash.ogg', 60, TRUE, 1)
else if(!H.head || !(H.head.armor.getRating("melee") > 20))
else if(!H.head || !(H.head.armor.getRating(MELEE) > 20))
if(prob(75))
H.visible_message("<span class='danger'>[H] falls in the drained pool!</span>",
"<span class='userdanger'>You fall in the drained pool!</span>")