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

Merge pull request #8137 from Incoming5643/so_misunderstood

Browse Source 
Removes the Spooky
This commit is contained in:
Cheridan
2015-03-06 00:09:25 -06:00
parent d56cb89407 8192ea7e06
commit 6b512f663a
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Goon-420BlazeIt.dm
+2 -6
View File
@@ -127,12 +127,8 @@ datum/reagent/crank/addiction_act_stage4(var/mob/living/M as mob)
..()
return
/datum/reagent/krokodil/addiction_act_stage4(var/mob/living/carbon/human/M as mob)
if(!istype(M.dna.species, /datum/species/skeleton))
M << "<span class='userdanger'>Your skin falls off! Holy shit!</span>"
M.adjustBruteLoss(rand(50,80)*REM) // holy shit your skin just FELL THE FUCK OFF
hardset_dna(M, null, null, null, null, /datum/species/skeleton)
else
M.adjustBruteLoss(5*REM)
M << "<span class='userdanger'>Your skin sloughs off!</span>"
M.adjustBruteLoss(rand(50,80)*REM) // holy shit your skin just FELL THE FUCK OFF
..()
return
code/modules/reagents/Chemistry-Goon-Medicine.dm
-1
View File
@@ -618,7 +618,6 @@ datum/reagent/strange_reagent/reaction_mob(var/mob/living/carbon/human/M as mob,
living_mob_list |= list(M)
M.emote("gasp")
add_logs(M, M, "revived", object="strange reagent")
hardset_dna(M, null, null, null, null, /datum/species/zombie)
..()
return
datum/reagent/strange_reagent/on_mob_life(var/mob/living/M as mob)