cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 02:54:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes wooden holotables having no sprite

Browse Source 
can interact with holotables and holoracks in more ways, they will not drop construction materials on destruction
holotables will smooth with their type
This commit is contained in:
uraniummeltdown
2018-01-13 00:51:17 +05:00
parent 7f4c9263ce
commit 4e63e4ce28
1 changed files with 6 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/HolodeckControl.dm
+6 -35
View File
@@ -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, "<span class='warning'>It's a holotable! There are no bolts!</span>")
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, "<span class='warning'>It's a holorack! There are no bolts!</span>")
return
can_deconstruct = FALSE
/obj/item/weapon/holo
damtype = STAMINA