Files
Waterpig bb70889f6e TG Upstream Part 1
3591 individual conflicts

Update build.js

Update install_node.sh

Update byond.js

oh my fucking god

hat

slow

huh

holy shit

we all fall down

2 more I missed

2900 individual conflicts

2700 Individual conflicts

replaces yarn file with tg version, bumping us down to 2200-ish

Down to 2000 individual conflicts

140 down

mmm

aaaaaaaaaaaaaaaaaaa

not yt

575

soon

900 individual conflicts

600 individual conflicts, 121 file conflicts

im not okay

160 across 19 files

29 in 4 files

0 conflicts, compiletime fix time

some minor incap stuff

missed ticks

weird dupe definition stuff

missed ticks 2

incap fixes

undefs and pie fix

Radio update and some extra minor stuff

returns a single override

no more dupe definitions, 175 compiletime errors

Unticked file fix

sound and emote stuff

honk and more radio stuff
2024-10-19 08:04:33 -07:00

194 lines
5.3 KiB
Plaintext

#define LOG_BURN_TIMER 5000 //SKYRAT EDIT original: #define LOG_BURN_TIMER 150
#define PAPER_BURN_TIMER 5
#define MAXIMUM_BURN_TIMER 100000 //SKYRAT EDIT original: #define MAXIMUM_BURN_TIMER 3000
/obj/structure/fireplace
name = "fireplace"
desc = "A large stone brick fireplace."
icon = 'icons/obj/fluff/fireplace.dmi'
icon_state = "fireplace"
density = FALSE
anchored = TRUE
pixel_x = -16
resistance_flags = FIRE_PROOF
light_color = LIGHT_COLOR_FIRE
light_angle = 170
light_flags = LIGHT_IGNORE_OFFSET
/// is the fireplace lit?
var/lit = FALSE
/// the amount of fuel for the fire
var/fuel_added = 0
/// how much time is left before fire runs out of fuel
var/flame_expiry_timer
/// the looping sound effect that is played while burning
var/datum/looping_sound/burning/burning_loop
/obj/structure/fireplace/Initialize(mapload)
. = ..()
burning_loop = new(src)
/obj/structure/fireplace/Destroy()
STOP_PROCESSING(SSobj, src)
QDEL_NULL(burning_loop)
. = ..()
/obj/structure/fireplace/setDir(newdir)
. = ..()
set_light(l_dir = dir)
/// We're offset back into the wall, account for that
/obj/structure/fireplace/get_light_offset()
var/list/hand_back = ..()
var/list/dir_offset = dir2offset(REVERSE_DIR(dir))
hand_back[1] += dir_offset[1] * 0.5
hand_back[2] += dir_offset[2] * 0.5
return hand_back
/obj/structure/fireplace/proc/try_light(obj/item/O, mob/user)
if(lit)
to_chat(user, span_warning("It's already lit!"))
return FALSE
if(!fuel_added)
to_chat(user, span_warning("[src] needs some fuel to burn!"))
return FALSE
var/msg = O.ignition_effect(src, user)
if(msg)
visible_message(msg)
ignite()
return TRUE
/obj/structure/fireplace/attackby(obj/item/T, mob/user)
if(istype(T, /obj/item/stack/sheet/mineral/wood))
var/obj/item/stack/sheet/mineral/wood/wood = T
var/space_remaining = MAXIMUM_BURN_TIMER - burn_time_remaining()
var/space_for_logs = round(space_remaining / LOG_BURN_TIMER)
if(space_for_logs < 1)
to_chat(user, span_warning("You can't fit any more of [T] in [src]!"))
return
var/logs_used = min(space_for_logs, wood.amount)
wood.use(logs_used)
adjust_fuel_timer(LOG_BURN_TIMER * logs_used)
user.visible_message("<span class='notice'>[user] tosses some \
wood into [src].</span>", "<span class='notice'>You add \
some fuel to [src].</span>")
else if(istype(T, /obj/item/paper_bin))
var/obj/item/paper_bin/paper_bin = T
user.visible_message("<span class='notice'>[user] throws [T] into \
[src].</span>", "<span class='notice'>You add [T] to [src].\
</span>")
adjust_fuel_timer(PAPER_BURN_TIMER * paper_bin.total_paper)
qdel(paper_bin)
else if(istype(T, /obj/item/paper))
user.visible_message("<span class='notice'>[user] throws [T] into \
[src].</span>", "<span class='notice'>You throw [T] into [src].\
</span>")
adjust_fuel_timer(PAPER_BURN_TIMER)
qdel(T)
else if(try_light(T,user))
return
else
. = ..()
/obj/structure/fireplace/update_overlays()
. = ..()
if(!lit)
return
switch(burn_time_remaining())
if(0 to 500)
. += "fireplace_fire0"
if(500 to 1000)
. += "fireplace_fire1"
if(1000 to 1500)
. += "fireplace_fire2"
if(1500 to 2000)
. += "fireplace_fire3"
if(2000 to MAXIMUM_BURN_TIMER)
. += "fireplace_fire4"
. += "fireplace_glow"
/obj/structure/fireplace/proc/adjust_light()
if(!lit)
set_light(0)
return
switch(burn_time_remaining())
if(0 to 19999) //SKYRAT EDIT original: if(0 to 500)
set_light(1)
if(20000 to 39999) //SKYRAT EDIT original: if(500 to 1000)
set_light(2)
if(40000 to 59999) //SKYRAT EDIT original: if(1000 to 1500)
set_light(3)
if(60000 to 79999) //SKYRAT EDIT original: if(1500 to 2000)
set_light(4)
if(80000 to MAXIMUM_BURN_TIMER) //SKYRAT EDIT original: if(2000 to MAXIMUM_BURN_TIMER)
set_light(6)
/obj/structure/fireplace/process(seconds_per_tick)
if(!lit)
return
if(world.time > flame_expiry_timer)
put_out()
return
var/turf/T = get_turf(src)
T.hotspot_expose(700, 2.5 * seconds_per_tick)
update_appearance()
adjust_light()
/obj/structure/fireplace/extinguish()
. = ..()
if(lit)
var/fuel = burn_time_remaining()
flame_expiry_timer = 0
put_out()
adjust_fuel_timer(fuel)
/obj/structure/fireplace/proc/adjust_fuel_timer(amount)
if(lit)
flame_expiry_timer += amount
if(burn_time_remaining() < MAXIMUM_BURN_TIMER)
flame_expiry_timer = world.time + MAXIMUM_BURN_TIMER
else
fuel_added = clamp(fuel_added + amount, 0, MAXIMUM_BURN_TIMER)
/obj/structure/fireplace/proc/burn_time_remaining()
if(lit)
return max(0, flame_expiry_timer - world.time)
else
return max(0, fuel_added)
/obj/structure/fireplace/proc/ignite()
START_PROCESSING(SSobj, src)
burning_loop.start()
lit = TRUE
desc = "A large stone brick fireplace, warm and cozy."
flame_expiry_timer = world.time + fuel_added
fuel_added = 0
update_appearance()
adjust_light()
particles = new /particles/smoke/burning()
switch(dir)
if(SOUTH)
particles.position = list(0, 29, 0)
if(EAST)
particles.position = list(-20, 9, 0)
if(WEST)
particles.position = list(20, 9, 0)
if(NORTH) // there is no icon state for SOUTH
QDEL_NULL(particles)
/obj/structure/fireplace/proc/put_out()
STOP_PROCESSING(SSobj, src)
burning_loop.stop()
lit = FALSE
update_appearance()
adjust_light()
desc = initial(desc)
QDEL_NULL(particles)
#undef LOG_BURN_TIMER
#undef PAPER_BURN_TIMER
#undef MAXIMUM_BURN_TIMER