cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-26 06:39:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reworking bonfire fuel logic.

Browse Source
This commit is contained in:
MistakeNot4892
2024-01-18 19:45:58 +11:00
parent 1d03b7a3d5
commit 00bed6e326
36 changed files with 146 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/bonfire.dm
+17 -22
View File
@@ -78,7 +78,7 @@
update_icon()
return TRUE
if(istype(W, /obj/item/stack/material/wood) || istype(W, /obj/item/stack/material/log) )
if(istype(W, /obj/item/stack/material/fuel/wood) || istype(W, /obj/item/stack/material/fuel/log) )
add_fuel(W, user)
return TRUE
@@ -112,9 +112,9 @@
/obj/structure/bonfire/proc/get_fuel_amount()
var/F = 0
for(var/A in contents)
if(istype(A, /obj/item/stack/material/wood))
if(istype(A, /obj/item/stack/material/fuel/wood))
F += 0.5
if(istype(A, /obj/item/stack/material/log))
if(istype(A, /obj/item/stack/material/fuel/log))
F += 1.0
return F
@@ -135,7 +135,7 @@
if(get_fuel_amount() >= 10)
to_chat(user, "<span class='warning'>\The [src] already has enough fuel!</span>")
return FALSE
if(istype(new_fuel, /obj/item/stack/material/wood) || istype(new_fuel, /obj/item/stack/material/log) )
if(istype(new_fuel, /obj/item/stack/material/fuel/wood) || istype(new_fuel, /obj/item/stack/material/fuel/log) )
var/obj/item/stack/F = new_fuel
var/obj/item/stack/S = F.split(1)
if(S)
@@ -156,13 +156,13 @@
qdel(consumed_fuel) // Don't know, don't care.
return FALSE
if(istype(consumed_fuel, /obj/item/stack/material/log))
if(istype(consumed_fuel, /obj/item/stack/material/fuel/log))
next_fuel_consumption = world.time + 2 MINUTES
qdel(consumed_fuel)
update_icon()
return TRUE
else if(istype(consumed_fuel, /obj/item/stack/material/wood)) // One log makes two planks of wood.
else if(istype(consumed_fuel, /obj/item/stack/material/fuel/wood)) // One log makes two planks of wood.
next_fuel_consumption = world.time + 1 MINUTE
qdel(consumed_fuel)
update_icon()
@@ -312,7 +312,7 @@
var/heating_power = 40000
/obj/structure/fireplace/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/stack/material/wood) || istype(W, /obj/item/stack/material/log) )
if(istype(W, /obj/item/stack/material/fuel/wood) || istype(W, /obj/item/stack/material/fuel/log) )
add_fuel(W, user)
else if(W.is_hot())
@@ -327,9 +327,9 @@
/obj/structure/fireplace/proc/get_fuel_amount()
var/F = 0
for(var/A in contents)
if(istype(A, /obj/item/stack/material/wood))
if(istype(A, /obj/item/stack/material/fuel/wood))
F += 0.5
if(istype(A, /obj/item/stack/material/log))
if(istype(A, /obj/item/stack/material/fuel/log))
F += 1.0
return F
@@ -344,7 +344,7 @@
if(get_fuel_amount() >= 10)
to_chat(user, "<span class='warning'>\The [src] already has enough fuel!</span>")
return FALSE
if(istype(new_fuel, /obj/item/stack/material/wood) || istype(new_fuel, /obj/item/stack/material/log) )
if(istype(new_fuel, /obj/item/stack/material/fuel/wood) || istype(new_fuel, /obj/item/stack/material/fuel/log) )
var/obj/item/stack/F = new_fuel
var/obj/item/stack/S = F.split(1)
if(S)
@@ -358,22 +358,17 @@
return FALSE
/obj/structure/fireplace/proc/consume_fuel(var/obj/item/stack/consumed_fuel)
if(!istype(consumed_fuel))
if(!istype(consumed_fuel, /obj/item/stack/material/fuel))
qdel(consumed_fuel) // Don't know, don't care.
return FALSE
if(istype(consumed_fuel, /obj/item/stack/material/log))
next_fuel_consumption = world.time + 2 MINUTES
qdel(consumed_fuel)
update_icon()
return TRUE
var/obj/item/stack/material/fuel/fuel_stack = consumed_fuel
next_fuel_consumption = world.time + max(1 MINUTE, fuel_stack + bonfire_fuel_time)
fuel_stack.use(1)
update_icon()
return TRUE
else if(istype(consumed_fuel, /obj/item/stack/material/wood)) // One log makes two planks of wood.
next_fuel_consumption = world.time + 1 MINUTE
qdel(consumed_fuel)
update_icon()
return TRUE
return FALSE
/obj/structure/fireplace/proc/check_oxygen()
var/datum/gas_mixture/G = loc.return_air()
code/game/objects/structures/crates_lockers/largecrate.dm
+1 -1
View File
@@ -26,7 +26,7 @@
if(!T)
to_chat(user, "<span class='notice'>You can't open this here!</span>")
if(W.is_crowbar())
new /obj/item/stack/material/wood(src)
new /obj/item/stack/material/fuel/wood(src)
for(var/atom/movable/AM in contents)
if(AM.simulated)
code/game/objects/structures/flora/trees.dm
+6 -6
View File
@@ -192,7 +192,7 @@
icon = 'icons/obj/flora/pinetrees.dmi'
icon_state = "pine_1"
base_state = "pine"
product = /obj/item/stack/material/log
product = /obj/item/stack/material/fuel/log
shake_animation_degrees = 3
/obj/structure/flora/tree/pine/choose_icon_state()
@@ -235,7 +235,7 @@
icon = 'icons/obj/flora/palmtrees.dmi'
icon_state = "palm1"
base_state = "palm"
product = /obj/item/stack/material/log
product = /obj/item/stack/material/fuel/log
product_amount = 5
health = 200
max_health = 200
@@ -251,7 +251,7 @@
icon = 'icons/obj/flora/deadtrees.dmi'
icon_state = "tree_1"
base_state = "tree"
product = /obj/item/stack/material/log
product = /obj/item/stack/material/fuel/log
product_amount = 5
health = 200
max_health = 200
@@ -265,7 +265,7 @@
icon = 'icons/obj/flora/jungletreesmall.dmi'
icon_state = "tree"
base_state = "tree"
product = /obj/item/stack/material/log
product = /obj/item/stack/material/fuel/log
product_amount = 10
health = 400
max_health = 400
@@ -280,7 +280,7 @@
icon = 'icons/obj/flora/jungletree.dmi'
icon_state = "tree"
base_state = "tree"
product = /obj/item/stack/material/log
product = /obj/item/stack/material/fuel/log
product_amount = 20
health = 800
max_health = 800
@@ -309,7 +309,7 @@
icon = 'icons/obj/flora/deadtrees.dmi'
icon_state = "tree_sif"
base_state = "tree_sif"
product = /obj/item/stack/material/log/sif
product = /obj/item/stack/material/fuel/log/sif
catalogue_data = list(/datum/category_item/catalogue/flora/sif_tree)
randomize_size = TRUE