Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting

# Conflicts:
#	paradise.dme
This commit is contained in:
Mark van Alphen
2019-04-26 22:58:56 +02:00
222 changed files with 1040 additions and 866 deletions
+6 -6
View File
@@ -16,7 +16,7 @@ var/const/INGEST = 2
/datum/reagents/New(maximum = 100)
maximum_volume = maximum
if(!(flags & REAGENT_NOREACT))
processing_objects |= src
START_PROCESSING(SSobj, src)
//I dislike having these here but map-objects are initialised before world/New() is called. >_>
if(!GLOB.chemical_reagents_list)
//Chemical Reagents - Initialises all /datum/reagent into a list indexed by reagent id
@@ -333,9 +333,9 @@ var/const/INGEST = 2
od_chems.Add(R.id)
return od_chems
/datum/reagents/proc/process()
/datum/reagents/process()
if(flags & REAGENT_NOREACT)
processing_objects -= src
STOP_PROCESSING(SSobj, src)
return
for(var/datum/reagent/R in reagent_list)
@@ -346,9 +346,9 @@ var/const/INGEST = 2
// Order is important, process() can remove from processing if
// the flag is present
flags &= ~(REAGENT_NOREACT)
processing_objects |= src
START_PROCESSING(SSobj, src)
else
processing_objects -= src
STOP_PROCESSING(SSobj, src)
flags |= REAGENT_NOREACT
/*
@@ -819,7 +819,7 @@ var/const/INGEST = 2
/datum/reagents/Destroy()
. = ..()
processing_objects -= src
STOP_PROCESSING(SSobj, src)
QDEL_LIST(reagent_list)
reagent_list = null
QDEL_LIST(addiction_list)
+1 -1
View File
@@ -169,7 +169,7 @@
return
if(M.mind && M.mind.changeling && M.mind.changeling.regenerating) //no messing with changeling's fake death
return
M.visible_message("<B>[M]</B> seizes up and falls limp, [M.p_their()] eyes dead and lifeless...") //so you can't trigger deathgasp emote on people. Edge case, but necessary.
M.emote("deathgasp")
M.status_flags |= FAKEDEATH
M.update_stat("fakedeath reagent")
M.med_hud_set_health()
@@ -8,7 +8,7 @@
drink_desc = "Vitamins! Yay!"
taste_message = "orange juice"
/datum/reagent/consumable/drink/orangejuicde/on_mob_life(mob/living/M)
/datum/reagent/consumable/drink/orangejuice/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
if(prob(30))
update_flags |= M.adjustOxyLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
@@ -89,7 +89,7 @@
drink_desc = "A healthy mixture of juices, guaranteed to keep you healthy until the next toolboxing takes place."
taste_message = "healthy dietary choices"
/datum/reagent/consumable/drink/doctors_delight/on_mob_life(mob/living/M)
/datum/reagent/consumable/drink/doctor_delight/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
if(prob(20))
update_flags |= M.adjustToxLoss(-1, FALSE)
@@ -905,8 +905,7 @@
/datum/reagent/vomit/reaction_turf(turf/T, volume)
if(volume >= 5 && !isspaceturf(T))
new /obj/effect/decal/cleanable/vomit(T)
playsound(T, 'sound/effects/splat.ogg', 50, 1, -3)
T.add_vomit_floor()
/datum/reagent/greenvomit
name = "Green vomit"
@@ -918,8 +917,7 @@
/datum/reagent/greenvomit/reaction_turf(turf/T, volume)
if(volume >= 5 && !isspaceturf(T))
new /obj/effect/decal/cleanable/vomit/green(T)
playsound(T, 'sound/effects/splat.ogg', 50, 1, -3)
T.add_vomit_floor(FALSE, TRUE)
////Lavaland Flora Reagents////
@@ -38,10 +38,10 @@
for(var/R in reagent_ids)
add_reagent(R)
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
/obj/item/reagent_containers/borghypo/Destroy()
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
return ..()
/obj/item/reagent_containers/borghypo/process() //Every [recharge_time] seconds, recharge some reagents for the cyborg
@@ -42,11 +42,11 @@
/obj/item/reagent_containers/iv_bag/proc/begin_processing(mob/target)
injection_target = target
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
/obj/item/reagent_containers/iv_bag/proc/end_processing()
injection_target = null
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
/obj/item/reagent_containers/iv_bag/process()
if(!injection_target)