diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 7a804bbc20f..3b400944959 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -46,17 +46,6 @@ var/global/list/datum/stack_recipe/rod_recipes = list ( \ return ..() -/obj/item/stack/rods/attack(var/obj/structure/grille/G, mob/user) - ..() - if(istype(G, /obj/structure/grille)) - if (G.destroyed) - user << "You rebuild the broken grille." - G.health = 10 - G.density = 1 - G.destroyed = 0 - G.icon_state = "grille" - use(1) - /obj/item/stack/rods/cyborg/ m_amt = 0 is_cyborg = 1 diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 69b2aaa5489..03de23007aa 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -117,6 +117,17 @@ user.visible_message("[user] [anchored ? "fastens" : "unfastens"] the [src].", \ "You have [anchored ? "fastened the [src] to" : "unfastened the [src] from"] the floor.") return + else if(istype(W, /obj/item/stack/rods) && destroyed) + var/obj/item/stack/rods/R = W + if(!shock(user, 90)) + user.visible_message("[user] rebuilds the broken grille.", \ + "You rebuild the broken grille.") + health = 10 + density = 1 + destroyed = 0 + icon_state = "grille" + R.use(1) + return //window placing begin else if(istype(W, /obj/item/stack/sheet/rglass) || istype(W, /obj/item/stack/sheet/glass)) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 4abf0d59dc1..dbab89b21fd 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -25,7 +25,6 @@ var/framestack = /obj/item/stack/rods var/buildstack = /obj/item/stack/sheet/metal var/busy = 0 - var/health = 15 /obj/structure/table/New() ..() @@ -204,11 +203,13 @@ return /obj/structure/table/attack_alien(mob/user) + playsound(src.loc, 'sound/weapons/bladeslice.ogg', 50, 1) visible_message("[user] slices [src] apart!") table_destroy(1) /obj/structure/table/attack_animal(mob/living/simple_animal/user) if(user.environment_smash) + playsound(src.loc, 'sound/weapons/Genhit.ogg', 50, 1) visible_message("[user] smashes [src] apart!") table_destroy(1) @@ -219,14 +220,10 @@ user.changeNext_move(CLICK_CD_MELEE) if(HULK in user.mutations) visible_message("[user] smashes [src] apart!") + playsound(src.loc, 'sound/effects/bang.ogg', 50, 1) user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) table_destroy(1) - else - playsound(loc, 'sound/items/dodgeball.ogg', 80, 1) - user.visible_message("[user] kicks [src].", \ - "You kick [src].") - health -= rand(1,2) - healthcheck() + return /obj/structure/table/attack_tk() // no telehulk sorry return @@ -315,11 +312,6 @@ if(user.drop_item()) I.Move(loc) -/obj/structure/table/proc/healthcheck() - if(health <= 0) - table_destroy(1) - return - /* * TABLE DESTRUCTION/DECONSTRUCTION @@ -331,7 +323,6 @@ /obj/structure/table/proc/table_destroy(var/destroy_type, var/mob/user) if(destroy_type == TBL_DESTROY) - playsound(src.loc, 'sound/weapons/Genhit.ogg', 50, 1) new framestack(src.loc) new buildstack(src.loc) qdel(src) @@ -377,7 +368,6 @@ desc = "What did I say about leaning on the glass tables? Now you need surgery." icon_state = "glass_table" buildstack = /obj/item/stack/sheet/glass - health = 8 /obj/structure/table/glass/tablepush(obj/item/I, mob/user) if(get_dist(src, user) < 2) @@ -468,18 +458,22 @@ return ..() - /obj/structure/table/reinforced/attack_paw(mob/user) attack_hand(user) -/obj/structure/table/reinforced/attack_hand(mob/user) - if(HULK in user.mutations) - visible_message("[user] smashes [src] apart!") - user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) - table_destroy(1) - else - return - +/obj/structure/table/reinforced/attack_hand(mob/user as mob) + user.changeNext_move(CLICK_CD_MELEE) + if ((HULK in user.mutations)) + if (prob(75)) + playsound(src, 'sound/effects/meteorimpact.ogg', 100, 1) + usr << text("You kick [src] into pieces.") + usr.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) + table_destroy(1) + return + else + playsound(src, 'sound/effects/bang.ogg', 50, 1) + usr << text("You kick [src].") + return /* * Racks