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

Fixes never being able to light molotovs and makes throwing them less crap

Browse Source
This commit is contained in:
Yoshax
2016-05-21 15:10:49 +01:00
parent b44011a646
commit 3044f6c080
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,7 +49,7 @@
if(!on_fire && istype(W, /obj/item/weapon/flame)) if(!on_fire && istype(W, /obj/item/weapon/flame))
var/obj/item/weapon/flame/F = W var/obj/item/weapon/flame/F = W
if(F.lit) if(F.lit)
ignite() src.ignite()
if(on_fire) if(on_fire)
visible_message("<span class='warning'>\The [user] lights [src] with [W].</span>") visible_message("<span class='warning'>\The [user] lights [src] with [W].</span>")
else else
@@ -151,7 +151,7 @@
/obj/item/weapon/reagent_containers/glass/rag/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) /obj/item/weapon/reagent_containers/glass/rag/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature >= 50 + T0C) if(exposed_temperature >= 50 + T0C)
ignite() src.ignite()
if(exposed_temperature >= 900 + T0C) if(exposed_temperature >= 900 + T0C)
new /obj/effect/decal/cleanable/ash(get_turf(src)) new /obj/effect/decal/cleanable/ash(get_turf(src))
qdel(src) qdel(src)

2
code/modules/reagents/reagent_containers/food/drinks/bottle.dm
View File

@@ -40,7 +40,7 @@
if(!isGlass || !smash_duration) if(!isGlass || !smash_duration)
return 0 return 0
var/list/chance_table = list(90, 90, 85, 85, 60, 35, 15) //starting from distance 0 var/list/chance_table = list(100, 95, 90, 85, 75, 55, 35) //starting from distance 0
var/idx = max(distance + 1, 1) //since list indices start at 1 var/idx = max(distance + 1, 1) //since list indices start at 1
if(idx > chance_table.len) if(idx > chance_table.len)
return 0 return 0