shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removes duplicate typecaches

Browse Source
This commit is contained in:
Jordan Brown
2017-10-23 09:24:41 -04:00
committed by CitadelStationBot
parent 095839becf
commit c51edc3bcd
15 changed files with 48 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/iv_drip.dm
+10
View File
@@ -10,15 +10,25 @@
var/mob/living/carbon/attached = null
var/mode = IV_INJECTING
var/obj/item/reagent_containers/beaker = null
<<<<<<< HEAD
var/list/drip_containers = list(/obj/item/reagent_containers/blood,
/obj/item/reagent_containers/food,
/obj/item/reagent_containers/glass)
=======
var/static/list/drip_containers = typecacheof(list(/obj/item/reagent_containers/blood,
/obj/item/reagent_containers/food,
/obj/item/reagent_containers/glass))
>>>>>>> 8e434b7... Removes duplicate typecaches (#31883)
/obj/machinery/iv_drip/Initialize()
. = ..()
update_icon()
<<<<<<< HEAD
drip_containers = typecacheof(drip_containers)
=======
>>>>>>> 8e434b7... Removes duplicate typecaches (#31883)
/obj/machinery/iv_drip/Destroy()
attached = null
QDEL_NULL(beaker)
code/game/turfs/simulated/dirtystation.dm
+1 -1
View File
@@ -72,7 +72,7 @@
return
//Hangars and pods covered in oil.
var/static/list/oily_areas = typecacheof(list(/area/quartermaster))
var/static/list/oily_areas = typecacheof(/area/quartermaster)
if(is_type_in_typecache(A, oily_areas))
if(prob(25))
new /obj/effect/decal/cleanable/oil(src)