mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-26 22:57:39 +01:00
Memory tracking shenanigans (#8359)
This commit is contained in:
@@ -101,17 +101,17 @@
|
||||
user.drop_from_inventory(C)
|
||||
qdel(C)
|
||||
return
|
||||
var/padding_type
|
||||
var/padding_type
|
||||
//CHOMPEDIT START: making carpets different and not just the boring basic red no matter carpet type, consider merging material variables at stack level in future - Jack
|
||||
if(istype(W,/obj/item/stack/tile/carpet))
|
||||
var/obj/item/stack/tile/carpet/M = W
|
||||
if(M.material && (M.material.flags & MATERIAL_PADDING))
|
||||
padding_type = "[M.material.name]"
|
||||
//CHOMPEDIT END
|
||||
padding_type = "[M.material.name]"
|
||||
//CHOMPEDIT END
|
||||
else if(istype(W,/obj/item/stack/material))
|
||||
var/obj/item/stack/material/M = W
|
||||
if(M.material && (M.material.flags & MATERIAL_PADDING))
|
||||
padding_type = "[M.material.name]"
|
||||
padding_type = "[M.material.name]"
|
||||
if(!padding_type)
|
||||
to_chat(user, "You cannot pad \the [src] with that.")
|
||||
return
|
||||
@@ -242,7 +242,8 @@
|
||||
desc = "A collapsed roller bed that can be carried around."
|
||||
icon = 'icons/obj/rollerbed.dmi'
|
||||
icon_state = "folded_rollerbed"
|
||||
center_of_mass = list("x" = 17,"y" = 7)
|
||||
center_of_mass_x = 17 //CHOMPEdit
|
||||
center_of_mass_y= 7 //CHOMPEdit
|
||||
slot_flags = SLOT_BACK
|
||||
w_class = ITEMSIZE_LARGE
|
||||
var/rollertype = /obj/item/roller
|
||||
|
||||
@@ -7,7 +7,8 @@ var/global/list/stool_cache = list() //haha stool
|
||||
icon = 'icons/obj/furniture_vr.dmi' //VOREStation Edit - new Icons
|
||||
icon_state = "stool_preview" //set for the map
|
||||
randpixel = 0
|
||||
center_of_mass = null
|
||||
center_of_mass_x = 0 //CHOMPEdit
|
||||
center_of_mass_y = 0 //CHOMPEdit
|
||||
force = 10
|
||||
throwforce = 10
|
||||
w_class = ITEMSIZE_HUGE
|
||||
|
||||
@@ -4,7 +4,8 @@
|
||||
icon = 'icons/obj/furniture_vr.dmi' //VOREStation Edit - new Icons
|
||||
icon_state = "bar_stool_preview" //set for the map
|
||||
randpixel = 0
|
||||
center_of_mass = null
|
||||
center_of_mass_x = 0 //CHOMPEdit
|
||||
center_of_mass_y = 0 //CHOMPEdit
|
||||
force = 10
|
||||
throwforce = 10
|
||||
w_class = ITEMSIZE_HUGE
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
activated = 1
|
||||
for(var/obj/effect/wingrille_spawn/other in neighbours)
|
||||
if(!other.activated) other.activate()
|
||||
if(initialized && !QDELETED(src))
|
||||
if((flags & ATOM_INITIALIZED) && !QDELETED(src)) //CHOMPEdit
|
||||
qdel(src)
|
||||
|
||||
/obj/effect/wingrille_spawn/proc/handle_window_spawn(var/obj/structure/window/W)
|
||||
|
||||
Reference in New Issue
Block a user