cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-30 20:13:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Many vore improvements. (#7686)

Browse Source
This commit is contained in:
Matt Atlas
2019-12-19 20:06:14 +01:00
committed by Werner
parent bb65e5ac39
commit bbecc7b461
59 changed files with 239 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
View File

@@ -520,7 +520,7 @@
for(var/datum/reagent/R in ingested.reagent_list)
if(istype(R, /datum/reagent/alcohol/ethanol))
var/amount = min(P, R.volume)
M.ingested.remove_reagent(R.id, amount)
ingested.remove_reagent(R.id, amount)
P -= amount
if (P <= 0)
return
@@ -657,7 +657,7 @@
/datum/reagent/coughsyrup/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
M.add_chemical_effect(CE_PAINKILLER, 5) // very slight painkiller effect at low doses
/datum/reagent/coughsyrup/overdose(var/mob/living/carbon/M, var/alien, var/removed) // effects based loosely on DXM
/datum/reagent/coughsyrup/overdose(var/mob/living/carbon/human/M, var/alien, var/removed) // effects based loosely on DXM
M.hallucination = max(M.hallucination, 40)
M.add_chemical_effect(CE_PAINKILLER, 20) // stronger at higher doses
if(prob(dose))
@@ -1182,7 +1182,7 @@
M.add_chemical_effect(CE_PAINKILLER, 5)
M.drowsyness = 0
/datum/reagent/mental/bugjuice/overdose(var/mob/living/carbon/M, var/alien, var/removed, var/scale)
/datum/reagent/mental/bugjuice/overdose(var/mob/living/carbon/human/M, var/alien, var/removed, var/scale)
. = ..()
M.adjustOxyLoss(1 * removed * scale)
M.Weaken(10 * removed * scale)
@@ -1423,7 +1423,7 @@
M.add_chemical_effect(CE_CARDIOTOXIC, -removed * nutritionmod)
..()
/datum/reagent/adipemcina/overdose(var/mob/living/carbon/M, var/alien)
/datum/reagent/adipemcina/overdose(var/mob/living/carbon/human/M, var/alien)
if(istype(M))
if(prob(25))
M.add_chemical_effect(CE_HEPATOTOXIC, 1)

2
code/modules/reagents/reagent_containers/tooth_paste.dm
View File

@@ -71,7 +71,7 @@
if(!reagents.total_volume)
to_chat(user, "<span class='warning'>The [initial(name)] is dry!</span>")
else if(reagents.total_volume)
if(user.zone_sel.selecting == "mouth" && !(M.wear_mask && M.wear_mask.item_flags & AIRTIGHT))
if(user.zone_sel.selecting == BP_MOUTH && !(M.wear_mask && M.wear_mask.item_flags & AIRTIGHT))
user.do_attack_animation(src)
user.visible_message("<span class='warning'>[user] is trying to brush \the [target]'s teeth \the [src]!</span>")
playsound(loc, 'sound/effects/toothbrush.ogg', 15, 1)