Merge pull request #4503 from Neerti/1/1/2018_bonfires

Adds Bonfires
This commit is contained in:
Anewbe
2018-01-05 13:36:19 -05:00
committed by GitHub
14 changed files with 289 additions and 19 deletions

View File

@@ -34,4 +34,7 @@
/obj/item/device/assembly/igniter/attack_self(mob/user as mob)
activate()
add_fingerprint(user)
return
return
/obj/item/device/assembly/igniter/is_hot()
return TRUE

View File

@@ -140,7 +140,8 @@
recipes += new/datum/stack_recipe("coilgun stock", /obj/item/weapon/coilgun_assembly, 5)
/material/wood/log/generate_recipes()
return // Feel free to add log-only recipes here later if desired.
recipes = list()
recipes += new/datum/stack_recipe("bonfire", /obj/structure/bonfire, 5, time = 50, supplied_material = "[name]")
/material/cardboard/generate_recipes()
..()

View File

@@ -214,6 +214,7 @@
/obj/item/stack/material/log/sif
name = "alien log"
default_type = "alien log"
color = "#0099cc"
/obj/item/stack/material/log/attackby(var/obj/item/W, var/mob/user)

View File

@@ -697,13 +697,14 @@ var/list/name_to_material
name = "log"
icon_base = "log"
stack_type = /obj/item/stack/material/log
sheet_singular_name = "log"
sheet_plural_name = "logs"
sheet_singular_name = null
sheet_plural_name = "pile"
/material/wood/log/sif
name = "alien log"
icon_colour = "#0099cc" // Cyan-ish
stack_origin_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2)
stack_type = /obj/item/stack/material/log/sif
/material/wood/holographic
name = "holowood"

View File

@@ -1258,7 +1258,7 @@ var/global/list/damage_icon_parts = list()
/mob/living/carbon/human/update_fire(var/update_icons=1)
overlays_standing[FIRE_LAYER] = null
if(on_fire)
overlays_standing[FIRE_LAYER] = image("icon"='icons/mob/OnFire.dmi', "icon_state" = get_fire_icon_state(), "layer"=FIRE_LAYER)
overlays_standing[FIRE_LAYER] = image("icon"='icons/mob/OnFire.dmi', "icon_state" = get_fire_icon_state())
if(update_icons) update_icons()

View File

@@ -202,7 +202,7 @@
return TRUE
else if(on_fire)
set_light(light_range + 3, round(fire_stacks), l_color = "#FF9933")
set_light(min(round(fire_stacks), 3), round(fire_stacks), l_color = "#FF9933")
return TRUE
else