cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjusts molotovs to be able to use alcohol to set the rag alight

Browse Source
This commit is contained in:
Yoshax
2016-05-27 14:21:23 +01:00
parent 2624297495
commit ce9b4e8109
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/modules/detectivework/tools/rag.dm
View File

@@ -156,10 +156,16 @@
new /obj/effect/decal/cleanable/ash(get_turf(src)) new /obj/effect/decal/cleanable/ash(get_turf(src))
qdel(src) qdel(src)
//rag must have a minimum of 2 units welder fuel and at least 80% of the reagents must be welder fuel. //rag must have a minimum of 2 units welder fuel or ehtanol based reagents and at least 80% of the reagents must so.
//maybe generalize flammable reagents someday
/obj/item/weapon/reagent_containers/glass/rag/proc/can_ignite() /obj/item/weapon/reagent_containers/glass/rag/proc/can_ignite()
var/fuel = reagents.get_reagent_amount("fuel") var/fuel
if(reagents.get_reagent_amount("fuel"))
fuel += reagents.get_reagent_amount("fuel")
else
for(var/datum/reagent/ethanol/R in reagents.reagent_list)
fuel += reagents.get_reagent_amount(R.id)
return (fuel >= 2 && fuel >= reagents.total_volume*0.8) return (fuel >= 2 && fuel >= reagents.total_volume*0.8)
/obj/item/weapon/reagent_containers/glass/rag/proc/ignite() /obj/item/weapon/reagent_containers/glass/rag/proc/ignite()
@@ -217,5 +223,8 @@
return return
reagents.remove_reagent("fuel", reagents.maximum_volume/25) reagents.remove_reagent("fuel", reagents.maximum_volume/25)
for(var/datum/reagent/ethanol/R in reagents.reagent_list)
if(istype(R, /datum/reagent/ethanol))
reagents.remove_reagent(R.id, reagents.maximum_volume/25)
update_name() update_name()
burn_time-- burn_time--