light tweaks

This commit is contained in:
Geevies
2019-11-13 15:30:01 +02:00
parent c5a729d830
commit c1e95ba005
3 changed files with 16 additions and 3 deletions
@@ -563,7 +563,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
user.apply_damage(2,BURN,"r_hand")
user.visible_message("<span class='notice'>After a few attempts, [user] manages to light the [src], they however burn their finger in the process.</span>")
set_light(2)
set_light(2, 1, l_color = LIGHT_COLOR_LAVA)
START_PROCESSING(SSprocessing, src)
else
lit = 0
+9 -2
View File
@@ -228,6 +228,10 @@
var/add = welding ? "_on" : "_off"
icon_state = base_iconstate + add //These are given an _on/_off suffix before being used
item_state = base_itemstate + add
if(welding)
set_light(0.6, 0.5, 2.5, l_color = LIGHT_COLOR_CYAN)
else
set_light(0)
var/mob/M = loc
if(istype(M))
M.update_inv_l_hand()
@@ -284,7 +288,7 @@
/obj/item/weapon/weldingtool/process()
if(welding)
if(prob(5))
remove_fuel(1)
remove_fuel(1, null, colourChange = FALSE)
if(get_fuel() < 1)
setWelding(0)
@@ -394,9 +398,12 @@
return reagents.get_reagent_amount("fuel")
//Removes fuel from the welding tool. If a mob is passed, it will perform an eyecheck on the mob. This should probably be renamed to use()
/obj/item/weapon/weldingtool/proc/remove_fuel(var/amount = 1, var/mob/M = null)
/obj/item/weapon/weldingtool/proc/remove_fuel(var/amount = 1, var/mob/M = null, var/colourChange = TRUE)
if(!welding)
return 0
else if(welding && colourChange)
set_light(0.7, 2, 5, l_color = LIGHT_COLOR_CYAN)
addtimer(CALLBACK(src, /atom/proc/update_icon), 5)
if(get_fuel() >= amount)
reagents.remove_reagent("fuel", amount)
if(M)
+6
View File
@@ -0,0 +1,6 @@
author: Geeves
delete-after: True
changes:
- rscadd: "Lighters now have a different colour when on. Welders now produce light."