Merge pull request #9878 from Ghommie/Ghommie-cit382

Unmodularize several machinery and structures

code/game/machinery/Sleeper.dm

@@ -14,7 +14,7 @@
 	circuit = /obj/item/circuitboard/machine/sleeper
 	req_access = list(ACCESS_CMO) //Used for reagent deletion and addition of non medicines
 	var/efficiency = 1
-	var/min_health = -25
+	var/min_health = 30
 	var/list/available_chems
 	var/controls_inside = FALSE
 	var/list/possible_chems = list(

code/game/machinery/firealarm.dm

@@ -256,7 +256,6 @@
 					return
 	return ..()
 
-
 /obj/machinery/firealarm/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
 	. = ..()
 	if(.) //damage received

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, "<span class='warning'>You can't do that right now!</span>")
+			return TRUE
+		if(user.getStaminaLoss() >= STAMINA_SOFTCRIT)
+			to_chat(user, "<span class='warning'>You're too exhausted for that.</span>")
+			return TRUE
+		var/mob/living/poordude = buckled_mobs[1]
+		if(!istype(poordude))
+			return TRUE
+		user.visible_message("<span class='notice'>[user] pulls [src] out from under [poordude].</span>", "<span class='notice'>You pull [src] out from under [poordude].</span>")
+		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))
 		..()

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."

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(CLICK_CD_MELEE)
+		if(istype(user) && user.a_intent == INTENT_HARM)
+			user.visible_message("<span class='warning'>[user] slams [user.p_their()] palms down on [src].</span>", "<span class='warning'>You slam your palms down on [src].</span>")
+			playsound(src, 'sound/weapons/sonic_jackhammer.ogg', 50, 1)
+		else
+			user.visible_message("<span class='notice'>[user] slaps [user.p_their()] hands on [src].</span>", "<span class='notice'>You slap your hands on [src].</span>")
+			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))

modular_citadel/code/game/machinery/Sleeper.dm

@@ -1,2 +0,0 @@
-/obj/machinery/sleeper
-	min_health = 30

modular_citadel/code/game/machinery/displaycases.dm

@@ -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)

modular_citadel/code/game/objects/structures/beds_chairs/chair.dm

@@ -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, "<span class='warning'>You can't do that right now!</span>")
-			return TRUE
-		if(user.getStaminaLoss() >= STAMINA_SOFTCRIT)
-			to_chat(user, "<span class='warning'>You're too exhausted for that.</span>")
-			return TRUE
-		var/mob/living/poordude = buckled_mobs[1]
-		if(!istype(poordude))
-			return TRUE
-		user.visible_message("<span class='notice'>[user] pulls [src] out from under [poordude].</span>", "<span class='notice'>You pull [src] out from under [poordude].</span>")
-		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

modular_citadel/code/game/objects/structures/tables_racks.dm

@@ -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("<span class='warning'>[user] slams [user.p_their()] palms down on [src].</span>", "<span class='warning'>You slam your palms down on [src].</span>")
-			playsound(src, 'sound/weapons/sonic_jackhammer.ogg', 50, 1)
-		else
-			user.visible_message("<span class='notice'>[user] slaps [user.p_their()] hands on [src].</span>", "<span class='notice'>You slap your hands on [src].</span>")
-			playsound(src, 'sound/weapons/tap.ogg', 50, 1)
-		user.do_attack_animation(src)
-		return TRUE

tgstation.dme

@@ -3066,8 +3066,6 @@
 #include "modular_citadel\code\datums\status_effects\chems.dm"
 #include "modular_citadel\code\datums\status_effects\debuffs.dm"
 #include "modular_citadel\code\datums\wires\autoylathe.dm"
-#include "modular_citadel\code\game\machinery\displaycases.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"
@@ -3082,8 +3080,6 @@
 #include "modular_citadel\code\game\objects\items\devices\radio\encryptionkey.dm"
 #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\structures\tables_racks.dm"
-#include "modular_citadel\code\game\objects\structures\beds_chairs\chair.dm"
 #include "modular_citadel\code\modules\admin\admin.dm"
 #include "modular_citadel\code\modules\admin\chat_commands.dm"
 #include "modular_citadel\code\modules\admin\holder2.dm"