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

Material Science 1: A bunch of math (#95090)

Browse Source
This commit is contained in:
SmArtKar
2026-02-22 16:53:51 +11:00
committed by GitHub
parent 6561c841d0
commit a3498fdcd7
95 changed files with 1816 additions and 1435 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/beds_chairs/chair.dm
+1 -1
View File
@@ -469,7 +469,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0)
if(remaining_mats)
for(var/M=1 to remaining_mats)
new stack_type(get_turf(loc))
else if(custom_materials[GET_MATERIAL_REF(/datum/material/iron)])
else if(custom_materials[SSmaterials.get_material(/datum/material/iron)])
new /obj/item/stack/rods(get_turf(loc), 2)
qdel(src)
code/game/objects/structures/toiletbong.dm
+1 -1
View File
@@ -97,7 +97,7 @@
new /obj/item/flamethrower(get_turf(src))
var/obj/item/tank/internals/plasma/ptank = new /obj/item/tank/internals/plasma(get_turf(src))
ptank.air_contents.gases[/datum/gas/plasma][MOLES] = (0)
drop_costum_materials()
drop_custom_materials()
qdel(src)
return TRUE
code/game/objects/structures/water_structures/toilet.dm
+2 -2
View File
@@ -237,7 +237,7 @@
/obj/structure/toilet/atom_deconstruct(dissambled = TRUE)
dump_contents()
drop_costum_materials()
drop_custom_materials()
if(has_water_reclaimer)
new /obj/item/stock_parts/water_recycler(drop_location())
@@ -425,7 +425,7 @@
if (suicide.transferItemToLoc(thing, newloc = src, silent = TRUE))
add_cistern_item(thing)
suicide.gib(DROP_BRAIN) //we delete everything but the brain, as it's going to be moved to the cistern
set_custom_materials(list(GET_MATERIAL_REF(/datum/material/meat/mob_meat, suicide) = SHEET_MATERIAL_AMOUNT))
set_custom_materials(list(SSmaterials.get_material(/datum/material/meat/mob_meat, suicide) = SHEET_MATERIAL_AMOUNT))
else
toilet_brain = new(drop_location())
set_custom_materials(list(/datum/material/meat = SHEET_MATERIAL_AMOUNT))
code/game/objects/structures/window.dm
+1 -1
View File
@@ -346,7 +346,7 @@
///Spawns shard and debris decal based on the glass_material_datum, spawns rods if window is reinforned and number of shards/rods is determined by the window being fulltile or not.
/obj/structure/window/proc/spawn_debris(location)
var/datum/material/glass_material_ref = GET_MATERIAL_REF(glass_material_datum)
var/datum/material/glass_material_ref = SSmaterials.get_material(glass_material_datum)
var/obj/item/shard_type = glass_material_ref.shard_type
var/obj/effect/decal/debris_type = glass_material_ref.debris_type
var/list/dropped_debris = list()