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

Everything else through the door (#19358)

Browse Source
This commit is contained in:
Vi3trice
2022-10-13 21:56:58 +02:00
committed by GitHub
parent 2410930b2b
commit 59dfdba201
134 changed files with 200 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/holder.dm
+2 -2
View File
@@ -130,7 +130,7 @@
if(total_volume <= 0)
return
var/datum/reagents/R
if(istype(target, /obj))
if(isobj(target))
var/obj/O = target
if(!O.reagents)
return
@@ -532,7 +532,7 @@
react_type = "LIVING"
else if(isturf(A))
react_type = "TURF"
else if(istype(A, /obj))
else if(isobj(A))
react_type = "OBJ"
else
return
code/modules/reagents/chemistry/reagents/water.dm
+2 -2
View File
@@ -169,13 +169,13 @@
return
if(volume < 3)
return
if(!data["donor"] || istype(data["donor"], /mob/living/carbon/human))
if(!data["donor"] || ishuman(data["donor"]))
var/obj/effect/decal/cleanable/blood/blood_prop = locate() in T //find some blood here
if(!blood_prop) //first blood!
blood_prop = new(T)
blood_prop.blood_DNA[data["blood_DNA"]] = data["blood_type"]
else if(istype(data["donor"], /mob/living/carbon/alien))
else if(isalien(data["donor"]))
var/obj/effect/decal/cleanable/blood/xeno/blood_prop = locate() in T
if(!blood_prop)
blood_prop = new(T)
code/modules/reagents/reagent_containers/dropper.dm
+1 -1
View File
@@ -72,7 +72,7 @@
return
if(reagents.total_volume)
if(!target.is_open_container() && !(istype(target, /obj/item/reagent_containers/food) && !istype(target, /obj/item/reagent_containers/food/pill)) && !istype(target, /obj/item/clothing/mask/cigarette))
if(!target.is_open_container() && !(istype(target, /obj/item/reagent_containers/food) && !ispill(target)) && !istype(target, /obj/item/clothing/mask/cigarette))
to_chat(user, "<span class='warning'>You cannot directly fill this object.</span>")
return