cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] sane stacks (#11533)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-08-29 16:12:10 -07:00
committed by GitHub
parent 4797afe137
commit a272557ccd
21 changed files with 45 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/game/objects/structures/bonfire.dm
View File

@@ -19,6 +19,7 @@
material_name = MAT_WOOD
material = get_material_by_name("[material_name]")
if(!material)
stack_trace("Material of type: [material_name] does not exist.")
return INITIALIZE_HINT_QDEL
color = material.icon_colour

1
code/game/objects/structures/gravemarker.dm
View File

@@ -24,6 +24,7 @@
material_name = MAT_WOOD
material = get_material_by_name("[material_name]")
if(!material)
stack_trace("Material of type: [material_name] does not exist.")
return INITIALIZE_HINT_QDEL
color = material.icon_colour
AddElement(/datum/element/climbable)

2
code/game/objects/structures/props/puzzledoor.dm
View File

@@ -37,7 +37,7 @@
/obj/machinery/door/blast/puzzle/Initialize(mapload)
. = ..()
implicit_material = get_material_by_name("dungeonium")
implicit_material = get_material_by_name(MAT_ALIEN_DUNGEON)
if(locks.len)
return
var/check_range = world.view * checkrange_mult

1
code/game/objects/structures/stool_bed_chair_nest/bed.dm
View File

@@ -30,6 +30,7 @@
new_material = MAT_STEEL
material = get_material_by_name(new_material)
if(!istype(material))
stack_trace("Material of type: [new_material] does not exist.")
return INITIALIZE_HINT_QDEL
if(new_padding_material)
padding_material = get_material_by_name(new_padding_material)

5
code/game/objects/structures/stool_bed_chair_nest/stools.dm
View File

@@ -23,10 +23,11 @@
if(!new_material)
new_material = MAT_STEEL
material = get_material_by_name(new_material)
if(!istype(material))
stack_trace("Material of type: [new_material] does not exist.")
return INITIALIZE_HINT_QDEL
if(new_padding_material)
padding_material = get_material_by_name(new_padding_material)
if(!istype(material))
return INITIALIZE_HINT_QDEL
force = round(material.get_blunt_damage()*0.4)
update_icon()