From 4e63e4ce281d512917d96ab20c69ecbe2ef94cca Mon Sep 17 00:00:00 2001 From: uraniummeltdown Date: Sat, 13 Jan 2018 00:51:17 +0500 Subject: [PATCH] fixes wooden holotables having no sprite can interact with holotables and holoracks in more ways, they will not drop construction materials on destruction holotables will smooth with their type --- .../machinery/computer/HolodeckControl.dm | 41 +++---------------- 1 file changed, 6 insertions(+), 35 deletions(-) diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index 7d75d8ae016..1447be96d4f 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -353,30 +353,15 @@ // HOLOFLOOR DOES NOT GIVE A FUCK /obj/structure/table/holotable - name = "table" - -/obj/structure/table/holotable/attack_alien(mob/user as mob) - return attack_hand(user) - -/obj/structure/table/holotable/attack_animal(mob/living/simple_animal/user as mob) - return attack_hand(user) - -/obj/structure/table/holotable/attack_hand(mob/user as mob) - return // HOLOTABLE DOES NOT GIVE A FUCK - -/obj/structure/table/holotable/attackby(obj/item/weapon/W as obj, mob/user as mob, params) - if(istype(W, /obj/item/weapon/grab)) - return ..() - - if(istype(W, /obj/item/weapon/wrench)) - to_chat(user, "It's a holotable! There are no bolts!") - return + can_deconstruct = FALSE + canSmoothWith = list(/obj/structure/table/holotable) /obj/structure/table/holotable/wood - name = "table" + name = "wooden table" desc = "A square piece of wood standing on four wooden legs. It can not move." - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/smooth_structures/wood_table.dmi' icon_state = "wood_table" + canSmoothWith = list(/obj/structure/table/holotable/wood) /obj/item/clothing/gloves/boxing/hologlove name = "boxing gloves" @@ -396,21 +381,7 @@ flags = ON_BORDER /obj/structure/rack/holorack - name = "rack" - -/obj/structure/rack/holorack/attack_alien(mob/user as mob) - return attack_hand(user) - -/obj/structure/rack/holorack/attack_animal(mob/living/simple_animal/user as mob) - return attack_hand(user) - -/obj/structure/rack/holorack/attack_hand(mob/user as mob) - return // HOLORACK DOES NOT GIVE A FUCK - -/obj/structure/rack/holorack/attackby(obj/item/weapon/W as obj, mob/user as mob, params) - if(istype(W, /obj/item/weapon/wrench)) - to_chat(user, "It's a holorack! There are no bolts!") - return + can_deconstruct = FALSE /obj/item/weapon/holo damtype = STAMINA