From fe171ac40a77cf3922eaf272e6248ac5e87d8f08 Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Wed, 20 Nov 2019 06:13:57 +0100 Subject: [PATCH 1/2] Unmodularize several machinery and structures. --- code/game/machinery/Sleeper.dm | 2 +- code/game/machinery/firealarm.dm | 10 +++++++++ .../objects/structures/beds_chairs/chair.dm | 22 +++++++++++++++++++ code/game/objects/structures/displaycase.dm | 6 +++++ code/game/objects/structures/tables_racks.dm | 11 ++++++++++ .../code/game/machinery/Sleeper.dm | 2 -- .../code/game/machinery/displaycases.dm | 5 ----- .../code/game/machinery/firealarm.dm | 10 --------- .../objects/structures/beds_chairs/chair.dm | 21 ------------------ .../game/objects/structures/tables_racks.dm | 10 --------- tgstation.dme | 5 ----- 11 files changed, 50 insertions(+), 54 deletions(-) delete mode 100644 modular_citadel/code/game/machinery/Sleeper.dm delete mode 100644 modular_citadel/code/game/machinery/displaycases.dm delete mode 100644 modular_citadel/code/game/machinery/firealarm.dm delete mode 100644 modular_citadel/code/game/objects/structures/beds_chairs/chair.dm delete mode 100644 modular_citadel/code/game/objects/structures/tables_racks.dm diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 513fea4360..28d56dfeda 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -13,7 +13,7 @@ state_open = TRUE circuit = /obj/item/circuitboard/machine/sleeper var/efficiency = 1 - var/min_health = -25 + var/min_health = 30 var/list/available_chems var/controls_inside = FALSE var/list/possible_chems = list( diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 5c2676c2b9..f96f38b298 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -254,6 +254,16 @@ return return ..() +/obj/machinery/firealarm/alt_attack_hand(mob/user) + if(can_interact(usr)) + var/area/A = get_area(src) + if(istype(A)) + if(A.fire) + reset() + else + alarm() + return TRUE + return FALSE /obj/machinery/firealarm/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) . = ..() diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index cec97d5d8b..9b6923dcc7 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -88,6 +88,28 @@ else return ..() +/obj/structure/chair/alt_attack_hand(mob/living/user) + if(Adjacent(user) && istype(user)) + if(!item_chair || !user.can_hold_items() || !has_buckled_mobs() || buckled_mobs.len > 1 || dir != user.dir || flags_1 & NODECONSTRUCT_1) + return TRUE + if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user))) + to_chat(user, "You can't do that right now!") + return TRUE + if(user.getStaminaLoss() >= STAMINA_SOFTCRIT) + to_chat(user, "You're too exhausted for that.") + return TRUE + var/mob/living/poordude = buckled_mobs[1] + if(!istype(poordude)) + return TRUE + user.visible_message("[user] pulls [src] out from under [poordude].", "You pull [src] out from under [poordude].") + var/C = new item_chair(loc) + user.put_in_hands(C) + poordude.Knockdown(20)//rip in peace + user.adjustStaminaLoss(5) + unbuckle_all_mobs(TRUE) + qdel(src) + return TRUE + /obj/structure/chair/attack_tk(mob/user) if(!anchored || has_buckled_mobs() || !isturf(user.loc)) ..() diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index bcb025d14b..b5ba6370d9 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -237,6 +237,12 @@ start_showpiece_type = /obj/item/clothing/mask/facehugger/lamarr req_access = list(ACCESS_RD) +/obj/structure/displaycase/clown + desc = "In the event of clown, honk glass." + alert = TRUE + start_showpiece_type = /obj/item/bikehorn + req_access = list(ACCESS_CENT_GENERAL) + /obj/structure/displaycase/trophy name = "trophy display case" desc = "Store your trophies of accomplishment in here, and they will stay forever." diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index b12a26cd00..4d0aa25df0 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -182,6 +182,17 @@ else return ..() +/obj/structure/table/alt_attack_hand(mob/user) + if(user && Adjacent(user) && !user.incapacitated()) + user.setClickCooldown(1 SECONDS) + if(istype(user) && user.a_intent == INTENT_HARM) + user.visible_message("[user] slams [user.p_their()] palms down on [src].", "You slam your palms down on [src].") + playsound(src, 'sound/weapons/sonic_jackhammer.ogg', 50, 1) + else + user.visible_message("[user] slaps [user.p_their()] hands on [src].", "You slap your hands on [src].") + playsound(src, 'sound/weapons/tap.ogg', 50, 1) + user.do_attack_animation(src) + return TRUE /obj/structure/table/deconstruct(disassembled = TRUE, wrench_disassembly = 0) if(!(flags_1 & NODECONSTRUCT_1)) diff --git a/modular_citadel/code/game/machinery/Sleeper.dm b/modular_citadel/code/game/machinery/Sleeper.dm deleted file mode 100644 index 4cf04524b2..0000000000 --- a/modular_citadel/code/game/machinery/Sleeper.dm +++ /dev/null @@ -1,2 +0,0 @@ -/obj/machinery/sleeper - min_health = 30 diff --git a/modular_citadel/code/game/machinery/displaycases.dm b/modular_citadel/code/game/machinery/displaycases.dm deleted file mode 100644 index f660475cfc..0000000000 --- a/modular_citadel/code/game/machinery/displaycases.dm +++ /dev/null @@ -1,5 +0,0 @@ -/obj/structure/displaycase/clown - desc = "In the event of clown, honk glass." - alert = 1 - start_showpiece_type = /obj/item/bikehorn - req_access = list(ACCESS_CENT_GENERAL) diff --git a/modular_citadel/code/game/machinery/firealarm.dm b/modular_citadel/code/game/machinery/firealarm.dm deleted file mode 100644 index 7c136f4e4d..0000000000 --- a/modular_citadel/code/game/machinery/firealarm.dm +++ /dev/null @@ -1,10 +0,0 @@ -/obj/machinery/firealarm/alt_attack_hand(mob/user) - if(can_interact(usr)) - var/area/A = get_area(src) - if(istype(A)) - if(A.fire) - reset() - else - alarm() - return TRUE - return FALSE diff --git a/modular_citadel/code/game/objects/structures/beds_chairs/chair.dm b/modular_citadel/code/game/objects/structures/beds_chairs/chair.dm deleted file mode 100644 index b7843727df..0000000000 --- a/modular_citadel/code/game/objects/structures/beds_chairs/chair.dm +++ /dev/null @@ -1,21 +0,0 @@ -/obj/structure/chair/alt_attack_hand(mob/living/user) - if(Adjacent(user) && istype(user)) - if(!item_chair || !user.can_hold_items() || !has_buckled_mobs() || buckled_mobs.len > 1 || dir != user.dir || flags_1 & NODECONSTRUCT_1) - return TRUE - if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user))) - to_chat(user, "You can't do that right now!") - return TRUE - if(user.getStaminaLoss() >= STAMINA_SOFTCRIT) - to_chat(user, "You're too exhausted for that.") - return TRUE - var/mob/living/poordude = buckled_mobs[1] - if(!istype(poordude)) - return TRUE - user.visible_message("[user] pulls [src] out from under [poordude].", "You pull [src] out from under [poordude].") - var/C = new item_chair(loc) - user.put_in_hands(C) - poordude.Knockdown(20)//rip in peace - user.adjustStaminaLoss(5) - unbuckle_all_mobs(TRUE) - qdel(src) - return TRUE diff --git a/modular_citadel/code/game/objects/structures/tables_racks.dm b/modular_citadel/code/game/objects/structures/tables_racks.dm deleted file mode 100644 index 69dbe4e1cb..0000000000 --- a/modular_citadel/code/game/objects/structures/tables_racks.dm +++ /dev/null @@ -1,10 +0,0 @@ -/obj/structure/table/alt_attack_hand(mob/user) - if(user && Adjacent(user) && !user.incapacitated()) - if(istype(user) && user.a_intent == INTENT_HARM) - user.visible_message("[user] slams [user.p_their()] palms down on [src].", "You slam your palms down on [src].") - playsound(src, 'sound/weapons/sonic_jackhammer.ogg', 50, 1) - else - user.visible_message("[user] slaps [user.p_their()] hands on [src].", "You slap your hands on [src].") - playsound(src, 'sound/weapons/tap.ogg', 50, 1) - user.do_attack_animation(src) - return TRUE diff --git a/tgstation.dme b/tgstation.dme index 03c341d97a..b2b2840655 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -3000,9 +3000,6 @@ #include "modular_citadel\code\game\gamemodes\gangs\implant_gang.dm" #include "modular_citadel\code\game\gamemodes\miniantags\bot_swarm\swarmer_event.dm" #include "modular_citadel\code\game\gamemodes\revolution\revolution.dm" -#include "modular_citadel\code\game\machinery\displaycases.dm" -#include "modular_citadel\code\game\machinery\firealarm.dm" -#include "modular_citadel\code\game\machinery\Sleeper.dm" #include "modular_citadel\code\game\machinery\toylathe.dm" #include "modular_citadel\code\game\machinery\vending.dm" #include "modular_citadel\code\game\machinery\wishgranter.dm" @@ -3022,8 +3019,6 @@ #include "modular_citadel\code\game\objects\items\devices\radio\headset.dm" #include "modular_citadel\code\game\objects\items\devices\radio\shockcollar.dm" #include "modular_citadel\code\game\objects\items\storage\firstaid.dm" -#include "modular_citadel\code\game\objects\structures\tables_racks.dm" -#include "modular_citadel\code\game\objects\structures\beds_chairs\chair.dm" #include "modular_citadel\code\game\objects\structures\crates_lockers\closets\fitness.dm" #include "modular_citadel\code\game\objects\structures\crates_lockers\closets\wardrobe.dm" #include "modular_citadel\code\game\objects\structures\crates_lockers\closets\secure\citadel_lockers.dm" From f2aba997c73f2e867cce155ea3b83ae5a556b220 Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Wed, 20 Nov 2019 06:17:43 +0100 Subject: [PATCH 2/2] consistency --- code/game/objects/structures/tables_racks.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 4d0aa25df0..bf16d896c1 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -184,7 +184,7 @@ /obj/structure/table/alt_attack_hand(mob/user) if(user && Adjacent(user) && !user.incapacitated()) - user.setClickCooldown(1 SECONDS) + user.setClickCooldown(CLICK_CD_MELEE) if(istype(user) && user.a_intent == INTENT_HARM) user.visible_message("[user] slams [user.p_their()] palms down on [src].", "You slam your palms down on [src].") playsound(src, 'sound/weapons/sonic_jackhammer.ogg', 50, 1)