cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Formatting changes

Browse Source
This commit is contained in:
Citinited
2017-08-06 00:56:23 +01:00
parent 52ce095479
commit 49ca1abc2a
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items.dm
+1 -1
View File
@@ -202,7 +202,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
to_chat(user, msg)
/obj/item/attack_hand(mob/user as mob, var/pickupfireoverride = FALSE)
/obj/item/attack_hand(mob/user as mob, pickupfireoverride = FALSE)
if(!user) return 0
if(hasorgans(user))
var/mob/living/carbon/human/H = user
code/modules/food_and_drinks/drinks/drinks/shotglass.dm
+4 -5
View File
@@ -41,10 +41,10 @@
if(burn_state != ON_FIRE)
return
user.visible_message("<span class = 'warning'>[user] pours [src] all over themself!</span>", "<span class = 'danger'>You pour [src] all over yourself!</span>", "<span class = 'warning'>You hear a 'whoompf' and a sizzle.</span>")
extinguish(TRUE)
reagents.reaction(user, TOUCH)
reagents.clear_reagents()
user.IgniteMob()
extinguish(silent = TRUE)
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass/proc/isShotFlammable()
var/datum/reagent/R = reagents.get_master_reagent()
@@ -53,16 +53,15 @@
if(A.volume >= 5 && A.alcohol_perc >= 0.35) //Only an approximation to if something's flammable but it will do
return TRUE
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass/fire_act(global_overlay = FALSE, var/silent = FALSE)
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass/fire_act(global_overlay = FALSE)
if(!isShotFlammable() || burn_state == ON_FIRE) //You can't light a shot that's not flammable!
return
..()
set_light(light_intensity, null, light_color)
if(!silent)
visible_message("<span class = 'notice'>[src] begins to burn with a blue hue!</span>")
visible_message("<span class = 'notice'>[src] begins to burn with a blue hue!</span>")
update_icon()
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass/extinguish(var/silent = FALSE)
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass/extinguish(silent = FALSE)
..()
set_light(0)
if(!silent)