cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 13:09:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds SHOULD_CALL_PARENT to examine (#16822)

Browse Source 
* Another one I'm curious about

* those don't

* this should call parent

* beds need to be fully moved due to fantasy gateway

* fix that

* finish beds
This commit is contained in:
Kashargul
2025-01-03 08:27:02 +01:00
committed by GitHub
parent 59850bba20
commit df9b71e402
13 changed files with 86 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/implants/implantcircuits.dm
+2 -1
View File
@@ -36,7 +36,8 @@
IC.emp_act(severity)
/obj/item/implant/integrated_circuit/examine(mob/user)
return IC.examine(user)
. = ..()
. += IC.examine(user)
/obj/item/implant/integrated_circuit/attackby(var/obj/item/O, var/mob/user)
if(O.has_tool_quality(TOOL_CROWBAR) || istype(O, /obj/item/integrated_electronics) || istype(O, /obj/item/integrated_circuit) || O.has_tool_quality(TOOL_SCREWDRIVER) || istype(O, /obj/item/cell/device) )
code/game/objects/items/weapons/tape.dm
+1
View File
@@ -127,6 +127,7 @@
flags |= NOBLUDGEON
/obj/item/ducttape/examine(mob/user)
SHOULD_CALL_PARENT(FALSE)
return stuck.examine(user)
/obj/item/ducttape/proc/attach(var/obj/item/W)
code/game/objects/structures/pillows.dm
+2 -2
View File
@@ -51,8 +51,8 @@
plane = MOB_PLANE
var/sourcepillow = "/obj/item/bedsheet/pillow"
/obj/structure/bed/pillowpile/New()
..()
/obj/structure/bed/pillowpile/Initialize()
. = ..()
var/turf/T = get_turf(src)
new pillowpilefront(T)
code/game/objects/structures/stool_bed_chair_nest/bed.dm
+11 -11
View File
@@ -23,18 +23,18 @@
var/applies_material_colour = 1
var/flippable = TRUE
/obj/structure/bed/New(var/newloc, var/new_material, var/new_padding_material)
/obj/structure/bed/Initialize(var/newloc, var/new_material, var/new_padding_material)
..(newloc)
color = null
if(!new_material)
new_material = MAT_STEEL
material = get_material_by_name(new_material)
if(!istype(material))
qdel(src)
return
return INITIALIZE_HINT_QDEL
if(new_padding_material)
padding_material = get_material_by_name(new_padding_material)
update_icon()
return INITIALIZE_HINT_NORMAL
/obj/structure/bed/get_material()
return material
@@ -199,19 +199,19 @@
icon_state = "psychbed"
base_icon = "psychbed"
/obj/structure/bed/psych/New(var/newloc)
..(newloc,MAT_WOOD,MAT_LEATHER)
/obj/structure/bed/psych/Initialize(var/newloc)
. = ..(newloc,MAT_WOOD,MAT_LEATHER)
/obj/structure/bed/padded/New(var/newloc)
..(newloc,MAT_PLASTIC,MAT_COTTON)
/obj/structure/bed/padded/Initialize(var/newloc)
. = ..(newloc,MAT_PLASTIC,MAT_COTTON)
/obj/structure/bed/double
name = "double bed"
icon_state = "doublebed"
base_icon = "doublebed"
/obj/structure/bed/double/padded/New(var/newloc)
..(newloc,MAT_WOOD,MAT_COTTON)
/obj/structure/bed/double/padded/Initialize(var/newloc)
. = ..(newloc,MAT_WOOD,MAT_COTTON)
/obj/structure/bed/double/post_buckle_mob(mob/living/M as mob)
if(M.buckled == src)
@@ -304,8 +304,8 @@
icon_state = "rollerbed"
var/obj/item/roller/held
/obj/item/roller_holder/New()
..()
/obj/item/roller_holder/Initialize()
. = ..()
held = new /obj/item/roller(src)
/obj/item/roller_holder/attack_self(mob/user as mob)
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+50 -50
View File
@@ -9,8 +9,8 @@
buckle_lying = 0 //force people to sit up in chairs when buckled
var/propelled = 0 // Check for fire-extinguisher-driven chairs
/obj/structure/bed/chair/New(var/newloc, var/new_material, var/new_padding_material)
..()
/obj/structure/bed/chair/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..()
update_layer()
/obj/structure/bed/chair/attackby(obj/item/W as obj, mob/user as mob)
@@ -127,38 +127,38 @@
I.color = padding_material.icon_colour
add_overlay(I)
/obj/structure/bed/chair/comfy/brown/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_LEATHER)
/obj/structure/bed/chair/comfy/brown/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_LEATHER)
/obj/structure/bed/chair/comfy/red/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CARPET)
/obj/structure/bed/chair/comfy/red/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CARPET)
/obj/structure/bed/chair/comfy/teal/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_TEAL)
/obj/structure/bed/chair/comfy/teal/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_TEAL)
/obj/structure/bed/chair/comfy/black/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_BLACK)
/obj/structure/bed/chair/comfy/black/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_BLACK)
/obj/structure/bed/chair/comfy/green/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_GREEN)
/obj/structure/bed/chair/comfy/green/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_GREEN)
/obj/structure/bed/chair/comfy/purp/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_PURPLE)
/obj/structure/bed/chair/comfy/purp/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_PURPLE)
/obj/structure/bed/chair/comfy/blue/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/comfy/blue/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/comfy/beige/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_BEIGE)
/obj/structure/bed/chair/comfy/beige/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_BEIGE)
/obj/structure/bed/chair/comfy/lime/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_LIME)
/obj/structure/bed/chair/comfy/lime/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_LIME)
/obj/structure/bed/chair/comfy/yellow/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/comfy/yellow/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/comfy/orange/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_ORANGE)
/obj/structure/bed/chair/comfy/orange/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_ORANGE)
/obj/structure/bed/chair/comfy/rounded
name = "rounded chair"
@@ -166,38 +166,38 @@
icon_state = "roundedchair"
base_icon = "roundedchair"
/obj/structure/bed/chair/comfy/rounded/brown/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_LEATHER)
/obj/structure/bed/chair/comfy/rounded/brown/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_LEATHER)
/obj/structure/bed/chair/comfy/rounded/red/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CARPET)
/obj/structure/bed/chair/comfy/rounded/red/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CARPET)
/obj/structure/bed/chair/comfy/rounded/teal/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_TEAL)
/obj/structure/bed/chair/comfy/rounded/teal/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_TEAL)
/obj/structure/bed/chair/comfy/rounded/black/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_BLACK)
/obj/structure/bed/chair/comfy/rounded/black/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_BLACK)
/obj/structure/bed/chair/comfy/rounded/green/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_GREEN)
/obj/structure/bed/chair/comfy/rounded/green/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_GREEN)
/obj/structure/bed/chair/comfy/rounded/purple/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_PURPLE)
/obj/structure/bed/chair/comfy/rounded/purple/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_PURPLE)
/obj/structure/bed/chair/comfy/rounded/blue/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/comfy/rounded/blue/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/comfy/rounded/beige/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_BEIGE)
/obj/structure/bed/chair/comfy/rounded/beige/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_BEIGE)
/obj/structure/bed/chair/comfy/rounded/lime/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_LIME)
/obj/structure/bed/chair/comfy/rounded/lime/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_LIME)
/obj/structure/bed/chair/comfy/rounded/yellow/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/comfy/rounded/yellow/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/comfy/rounded/orange/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, MAT_STEEL, MAT_CLOTH_ORANGE)
/obj/structure/bed/chair/comfy/rounded/orange/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_ORANGE)
/obj/structure/bed/chair/office
anchored = FALSE
@@ -277,8 +277,8 @@
return
..()
/obj/structure/bed/chair/wood/New(var/newloc)
..(newloc, MAT_WOOD)
/obj/structure/bed/chair/wood/Initialize(var/newloc)
. = ..(newloc, MAT_WOOD)
/obj/structure/bed/chair/wood/wings
icon_state = "wooden_chair_wings"
@@ -364,8 +364,8 @@
color = null
var/padding_color = "#CC0000"
/obj/structure/bed/chair/sofa/bench/New(var/newloc, var/new_material, var/new_padding_material)
..()
/obj/structure/bed/chair/sofa/bench/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..()
var/mutable_appearance/MA
// If we're north-facing, metal goes above mob, padding overlay goes below mob.
if((dir & NORTH) && !corner_piece)
code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
+1 -1
View File
@@ -13,7 +13,7 @@
var/min_mob_buckle_size = MOB_SMALL
var/max_mob_buckle_size = MOB_LARGE
/obj/structure/bed/chair/wheelchair/New(var/newloc, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/wheelchair/Initialize(var/newloc, var/new_material, var/new_padding_material)
..()
update_icon()