cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into var/const-to-define

Browse Source
This commit is contained in:
AffectedArc07
2020-03-09 10:33:59 +00:00
committed by GitHub
parent 1df8d64b23 edebec5194
commit 5baaabe12e
50 changed files with 182 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/admin.dm
+1
View File
@@ -23,6 +23,7 @@
I.receive_damage(-5, FALSE)
for(var/obj/item/organ/external/E in H.bodyparts)
E.mend_fracture()
E.internal_bleeding = FALSE
M.SetEyeBlind(0, FALSE)
M.CureNearsighted(FALSE)
M.CureBlind(FALSE)
code/modules/reagents/chemistry/reagents/alcohol.dm
+3 -2
View File
@@ -1192,15 +1192,16 @@
taste_description = "motor oil"
/datum/reagent/consumable/ethanol/synthanol/on_mob_life(mob/living/M)
if(!M.isSynthetic())
if(!(M.dna.species.reagent_tag & PROCESS_SYN))
holder.remove_reagent(id, 3.6) //gets removed from organics very fast
if(prob(25))
holder.remove_reagent(id, 15)
M.fakevomit()
return ..()
/datum/reagent/consumable/ethanol/synthanol/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume)
if(M.isSynthetic())
if(M.dna.species.reagent_tag & PROCESS_SYN)
return
if(method == REAGENT_INGEST)
to_chat(M, pick("<span class = 'danger'>That was awful!</span>", "<span class = 'danger'>Yuck!</span>"))
code/modules/reagents/chemistry/reagents/drugs.dm
+26
View File
@@ -525,6 +525,32 @@
M.Drowsy(10)
return ..()
/datum/reagent/cbd
name = "Cannabidiol"
id = "cbd"
description = "A non-psychoactive phytocannabinoid extracted from the cannabis plant."
reagent_state = LIQUID
color = "#00e100"
taste_description = "relaxation"
/datum/reagent/cbd/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
if(prob(5))
M.emote(pick("hsigh", "yawn"))
if(prob(5))
to_chat(M, "<span class='notice'>[pick("You feel peaceful.", "You breathe softly.", "You feel chill.", "You vibe.")]</span>")
if(prob(10))
M.AdjustConfused(-5)
update_flags |= M.SetWeakened(0, FALSE)
if(volume >= 70 && prob(25))
if(M.reagents.has_reagent("thc") <= 20)
M.Drowsy(10)
if(prob(25))
update_flags |= M.adjustBruteLoss(-2, FALSE)
update_flags |= M.adjustFireLoss(-2, FALSE)
return ..() | update_flags
/datum/reagent/fliptonium
name = "Fliptonium"
id = "fliptonium"