Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765

code/game/machinery/Sleeper.dm

@@ -434,3 +434,45 @@
 
 /obj/machinery/sleeper/old
 	icon_state = "oldpod"
+
+/obj/machinery/sleeper/party
+	name = "party pod"
+	desc = "'Sleeper' units were once known for their healing properties, until a lengthy investigation revealed they were also dosing patients with deadly lead acetate. This appears to be one of those old 'sleeper' units repurposed as a 'Party Pod'. It’s probably not a good idea to use it."
+	icon_state = "partypod"
+	idle_power_usage = 3000
+	circuit = /obj/item/circuitboard/machine/sleeper/party
+	var/leddit = FALSE //Get it like reddit and lead alright fine
+	ui_x = 310
+	ui_y = 400
+
+	controls_inside = TRUE
+	possible_chems = list(
+		list(/datum/reagent/consumable/ethanol/beer, /datum/reagent/consumable/laughter),
+		list(/datum/reagent/spraytan,/datum/reagent/barbers_aid),
+		list(/datum/reagent/colorful_reagent,/datum/reagent/hair_dye),
+		list(/datum/reagent/drug/space_drugs,/datum/reagent/baldium)
+	)//Exclusively uses non-lethal, "fun" chems. At an obvious downside.
+	var/spray_chems = list(
+		/datum/reagent/spraytan, /datum/reagent/hair_dye, /datum/reagent/baldium, /datum/reagent/barbers_aid
+	)//Chemicals that need to have a touch or vapor reaction to be applied, not the standard chamber reaction.
+	enter_message = "<span class='notice'><b>You're surrounded by some funky music inside the chamber. You zone out as you feel waves of krunk vibe within you.</b></span>"
+
+/obj/machinery/sleeper/party/inject_chem(chem, mob/user)
+	if(leddit)
+		occupant.reagents.add_reagent(/datum/reagent/toxin/leadacetate, 4) //You're injecting chemicals into yourself from a recalled, decrepit medical machine. What did you expect?
+	else if (prob(20))
+		occupant.reagents.add_reagent(/datum/reagent/toxin/leadacetate, rand(1,3))
+	if(chem in spray_chems)
+		var/datum/reagents/holder = new()
+		holder.add_reagent(chem_buttons[chem], 10) //I hope this is the correct way to do this.
+		holder.reaction(occupant, VAPOR, 0)
+		holder.trans_to(occupant, 10)
+		playsound(src.loc, 'sound/effects/spray2.ogg', 50, TRUE, -6)
+		if(user)
+			log_combat(user, occupant, "sprayed [chem] into", addition = "via [src]")
+		return TRUE
+	..()
+
+/obj/machinery/sleeper/party/emag_act(mob/user)
+	..()
+	leddit = TRUE

code/game/machinery/autolathe.dm

@@ -60,7 +60,8 @@
 		/datum/material/runite,
 		/datum/material/plastic,
 		/datum/material/adamantine,
-		/datum/material/mythril
+		/datum/material/mythril,
+		/datum/material/wood
 		)
 
 	/// Base print speed

code/game/machinery/buttons.dm

@@ -3,7 +3,6 @@
 	desc = "A remote control switch."
 	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "doorctrl"
-	plane = ABOVE_WALL_PLANE
 	var/skin = "doorctrl"
 	power_channel = ENVIRON
 	var/obj/item/assembly/device
@@ -17,10 +16,13 @@
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
 
 /obj/machinery/button/Initialize(mapload, ndir = 0, built = 0)
-	if(istext(id) && mapload)
-		if(id[1] == "!")
-			id = SSmapping.get_obfuscated_id(id)
+	if(istext(id) && mapload && id[1] == "!")
+		id = SSmapping.get_obfuscated_id(id)
 	. = ..()
+	var/turf/T = get_turf_pixel(src)
+	if(iswallturf(T))
+		plane = ABOVE_WALL_PLANE
+
 	if(built)
 		setDir(ndir)
 		pixel_x = (dir & 3)? 0 : (dir == 4 ? -24 : 24)
@@ -28,7 +30,6 @@
 		panel_open = TRUE
 		update_icon()
 
-
 	if(!built && !device && device_type)
 		device = new device_type(src)
 

code/game/machinery/camera/presets.dm

@@ -75,7 +75,7 @@
 // UPGRADE PROCS
 
 /obj/machinery/camera/proc/upgradeEmpProof()
-	AddComponent(/datum/component/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES | EMP_PROTECT_CONTENTS)
+	AddElement(/datum/element/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES | EMP_PROTECT_CONTENTS)
 	assembly.upgrades.Add(new /obj/item/stack/sheet/mineral/plasma(assembly))
 	upgrades |= CAMERA_UPGRADE_EMP_PROOF
 

code/game/machinery/computer/camera.dm

@@ -169,13 +169,18 @@
 	desc = "Used for watching an empty arena."
 	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "telescreen"
-	plane = ABOVE_WALL_PLANE
 	network = list("thunder")
 	density = FALSE
 	circuit = null
 	clockwork = TRUE //it'd look very weird
 	light_power = 0
 
+/obj/machinery/computer/security/telescreen/Initialize()
+	. = ..()
+	var/turf/T = get_turf_pixel(src)
+	if(iswallturf(T))
+		plane = ABOVE_WALL_PLANE
+
 /obj/machinery/computer/security/telescreen/update_icon_state()
 	icon_state = initial(icon_state)
 	if(stat & BROKEN)

code/game/machinery/deployable.dm

@@ -70,14 +70,13 @@
 		if(W.amount < 5)
 			to_chat(user, "<span class='warning'>You need at least five wooden planks to make a wall!</span>")
 			return
-		else
-			to_chat(user, "<span class='notice'>You start adding [I] to [src]...</span>")
-			if(do_after(user, 50, target=src))
-				W.use(5)
-				var/turf/T = get_turf(src)
-				T.PlaceOnTop(/turf/closed/wall/mineral/wood/nonmetal)
-				qdel(src)
-				return
+		to_chat(user, "<span class='notice'>You start adding [I] to [src]...</span>")
+		if(do_after(user, 50, target=src))
+			W.use(5)
+			var/turf/T = get_turf(src)
+			T.PlaceOnTop(/turf/closed/wall/mineral/wood/nonmetal)
+			qdel(src)
+		return
 	return ..()
 
 

code/game/machinery/doors/airlock.dm

@@ -470,15 +470,15 @@
 			if(welded)
 				weld_overlay = get_airlock_overlay("welded", overlays_file)
 			if(obj_integrity < integrity_failure * max_integrity)
-				damag_overlay = get_airlock_overlay("sparks_broken", overlays_file, EMISSIVE_UNBLOCKABLE_LAYER, EMISSIVE_UNBLOCKABLE_PLANE)
+				damag_overlay = get_airlock_overlay("sparks_broken", overlays_file, ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE)
 			else if(obj_integrity < (0.75 * max_integrity))
-				damag_overlay = get_airlock_overlay("sparks_damaged", overlays_file, EMISSIVE_UNBLOCKABLE_LAYER, EMISSIVE_UNBLOCKABLE_PLANE)
+				damag_overlay = get_airlock_overlay("sparks_damaged", overlays_file, ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE)
 			if(lights && hasPower())
 
 				if(locked)
-					lights_overlay = get_airlock_overlay("lights_bolts", overlays_file, EMISSIVE_UNBLOCKABLE_LAYER, EMISSIVE_UNBLOCKABLE_PLANE)
+					lights_overlay = get_airlock_overlay("lights_bolts", overlays_file, ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE)
 				else if(emergency)
-					lights_overlay = get_airlock_overlay("lights_emergency", overlays_file, EMISSIVE_UNBLOCKABLE_LAYER, EMISSIVE_UNBLOCKABLE_PLANE)
+					lights_overlay = get_airlock_overlay("lights_emergency", overlays_file, ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE)
 			if(note)
 				note_overlay = get_airlock_overlay(notetype, note_overlay_file)
 
@@ -496,18 +496,18 @@
 				else
 					panel_overlay = get_airlock_overlay("panel_closed", overlays_file)
 			if(obj_integrity < integrity_failure * max_integrity)
-				damag_overlay = get_airlock_overlay("sparks_broken", overlays_file, EMISSIVE_UNBLOCKABLE_LAYER, EMISSIVE_UNBLOCKABLE_PLANE)
+				damag_overlay = get_airlock_overlay("sparks_broken", overlays_file, ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE)
 			else if(obj_integrity < (0.75 * max_integrity))
-				damag_overlay = get_airlock_overlay("sparks_damaged", overlays_file, EMISSIVE_UNBLOCKABLE_LAYER, EMISSIVE_UNBLOCKABLE_PLANE)
+				damag_overlay = get_airlock_overlay("sparks_damaged", overlays_file, ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE)
 			if(welded)
 				weld_overlay = get_airlock_overlay("welded", overlays_file)
-			lights_overlay = get_airlock_overlay("lights_denied", overlays_file, EMISSIVE_UNBLOCKABLE_LAYER, EMISSIVE_UNBLOCKABLE_PLANE)
+			lights_overlay = get_airlock_overlay("lights_denied", overlays_file, ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE)
 			if(note)
 				note_overlay = get_airlock_overlay(notetype, note_overlay_file)
 
 		if(AIRLOCK_EMAG)
 			frame_overlay = get_airlock_overlay("closed", icon)
-			sparks_overlay = get_airlock_overlay("sparks", overlays_file, EMISSIVE_UNBLOCKABLE_LAYER, EMISSIVE_UNBLOCKABLE_PLANE)
+			sparks_overlay = get_airlock_overlay("sparks", overlays_file, ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE)
 			if(airlock_material)
 				filling_overlay = get_airlock_overlay("[airlock_material]_closed", overlays_file)
 			else
@@ -518,9 +518,9 @@
 				else
 					panel_overlay = get_airlock_overlay("panel_closed", overlays_file)
 			if(obj_integrity < integrity_failure * max_integrity)
-				damag_overlay = get_airlock_overlay("sparks_broken", overlays_file, EMISSIVE_UNBLOCKABLE_LAYER, EMISSIVE_UNBLOCKABLE_PLANE)
+				damag_overlay = get_airlock_overlay("sparks_broken", overlays_file, ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE)
 			else if(obj_integrity < (0.75 * max_integrity))
-				damag_overlay = get_airlock_overlay("sparks_damaged", overlays_file, EMISSIVE_UNBLOCKABLE_LAYER, EMISSIVE_UNBLOCKABLE_PLANE)
+				damag_overlay = get_airlock_overlay("sparks_damaged", overlays_file, ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE)
 			if(welded)
 				weld_overlay = get_airlock_overlay("welded", overlays_file)
 			if(note)
@@ -533,7 +533,7 @@
 			else
 				filling_overlay = get_airlock_overlay("fill_closing", icon)
 			if(lights && hasPower())
-				lights_overlay = get_airlock_overlay("lights_closing", overlays_file, EMISSIVE_UNBLOCKABLE_LAYER, EMISSIVE_UNBLOCKABLE_PLANE)
+				lights_overlay = get_airlock_overlay("lights_closing", overlays_file, ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE)
 			if(panel_open)
 				if(security_level)
 					panel_overlay = get_airlock_overlay("panel_closing_protected", overlays_file)
@@ -554,7 +554,7 @@
 				else
 					panel_overlay = get_airlock_overlay("panel_open", overlays_file)
 			if(obj_integrity < (0.75 * max_integrity))
-				damag_overlay = get_airlock_overlay("sparks_open", overlays_file, EMISSIVE_UNBLOCKABLE_LAYER, EMISSIVE_UNBLOCKABLE_PLANE)
+				damag_overlay = get_airlock_overlay("sparks_open", overlays_file, ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE)
 			if(note)
 				note_overlay = get_airlock_overlay("[notetype]_open", note_overlay_file)
 
@@ -565,7 +565,7 @@
 			else
 				filling_overlay = get_airlock_overlay("fill_opening", icon)
 			if(lights && hasPower())
-				lights_overlay = get_airlock_overlay("lights_opening", overlays_file, EMISSIVE_UNBLOCKABLE_LAYER, EMISSIVE_UNBLOCKABLE_PLANE)
+				lights_overlay = get_airlock_overlay("lights_opening", overlays_file, ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE)
 			if(panel_open)
 				if(security_level)
 					panel_overlay = get_airlock_overlay("panel_opening_protected", overlays_file)
@@ -577,11 +577,17 @@
 	cut_overlays()
 	add_overlay(frame_overlay)
 	add_overlay(filling_overlay)
-	add_overlay(lights_overlay)
+	if(lights_overlay)
+		add_overlay(lights_overlay)
+		var/mutable_appearance/lights_vis = mutable_appearance(lights_overlay.icon, lights_overlay.icon_state)
+		add_overlay(lights_vis)
 	add_overlay(panel_overlay)
 	add_overlay(weld_overlay)
 	add_overlay(sparks_overlay)
-	add_overlay(damag_overlay)
+	if(damag_overlay)
+		add_overlay(damag_overlay)
+		var/mutable_appearance/damage_vis = mutable_appearance(damag_overlay.icon, damag_overlay.icon_state)
+		add_overlay(damage_vis)
 	add_overlay(note_overlay)
 	check_unres()
 

code/game/machinery/doors/shutters.dm

@@ -53,7 +53,9 @@
 		if("opening")
 			rad_insulation = 1
 		if("closing")
-			rad_insulation = 0.2
+			rad_insulation = -0.5
+
+// A 3x3 N2 SM setup won't irradiate you if you're behind the shutter at -0.9 insulation. If it starts to delam, it'll start irradiating you slowly. Keep the value between -0.1 to -0.9
 
 /obj/machinery/door/poddoor/shutters/window
 	name = "windowed shutters"

code/game/machinery/hypnochair.dm

@@ -0,0 +1,205 @@
+/obj/machinery/hypnochair
+	name = "enhanced interrogation chamber"
+	desc = "A device used to perform \"enhanced interrogation\" through invasive mental conditioning."
+	icon = 'icons/obj/machines/implantchair.dmi'
+	icon_state = "hypnochair"
+	circuit = /obj/item/circuitboard/machine/hypnochair
+	density = TRUE
+	opacity = 0
+	ui_x = 375
+	ui_y = 480
+	var/mob/living/carbon/victim = null ///Keeps track of the victim to apply effects if it teleports away
+	var/interrogating = FALSE ///Is the device currently interrogating someone?
+	var/start_time = 0 ///Time when the interrogation was started, to calculate effect in case of interruption
+	var/trigger_phrase = "" ///Trigger phrase to implant
+	var/timerid = 0 ///Timer ID for interrogations
+
+	var/message_cooldown = 0 ///Cooldown for breakout message
+
+/obj/machinery/hypnochair/Initialize()
+	. = ..()
+	open_machine()
+	update_icon()
+
+/obj/machinery/hypnochair/attackby(obj/item/I, mob/user, params)
+	if(!occupant && default_deconstruction_screwdriver(user, icon_state, icon_state, I))
+		update_icon()
+		return
+
+	if(default_pry_open(I))
+		return
+
+	if(default_deconstruction_crowbar(I))
+		return
+
+	return ..()
+
+/obj/machinery/hypnochair/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.notcontained_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "hypnochair", name, ui_x, ui_y, master_ui, state)
+		ui.open()
+
+/obj/machinery/hypnochair/ui_data()
+	var/list/data = list()
+	data["occupied"] = occupant ? TRUE : FALSE
+	data["open"] = state_open
+	data["interrogating"] = interrogating
+
+	data["occupant"] = list()
+	if(occupant)
+		var/mob/living/mob_occupant = occupant
+		data["occupant"]["name"] = mob_occupant.name
+		data["occupant"]["stat"] = mob_occupant.stat
+
+	data["trigger"] = trigger_phrase
+
+	return data
+
+/obj/machinery/hypnochair/ui_act(action, params)
+	if(..())
+		return
+	switch(action)
+		if("door")
+			if(state_open)
+				close_machine()
+			else
+				if(!interrogating)
+					open_machine()
+			. = TRUE
+		if("set_phrase")
+			set_phrase(params["phrase"])
+			. = TRUE
+		if("interrogate")
+			if(!interrogating)
+				interrogate()
+			else
+				interrupt_interrogation()
+			. = TRUE
+
+/obj/machinery/hypnochair/proc/set_phrase(phrase)
+	trigger_phrase = phrase
+
+/obj/machinery/hypnochair/proc/interrogate()
+	if(!trigger_phrase)
+		playsound(get_turf(src), 'sound/machines/buzz-sigh.ogg', 25, TRUE)
+		return
+	var/mob/living/carbon/C = occupant
+	if(!istype(C))
+		playsound(get_turf(src), 'sound/machines/buzz-sigh.ogg', 25, TRUE)
+		return
+	victim = C
+	if(!(C.get_eye_protection() > 0))
+		to_chat(C, "<span class='warning'>Strobing coloured lights assault you relentlessly! You're losing your ability to think straight!</span>")
+		C.become_blind("hypnochair")
+		ADD_TRAIT(C, TRAIT_DEAF, "hypnochair")
+	interrogating = TRUE
+	START_PROCESSING(SSobj, src)
+	start_time = world.time
+	update_icon()
+	timerid = addtimer(CALLBACK(src, .proc/finish_interrogation), 450, TIMER_STOPPABLE)
+
+/obj/machinery/hypnochair/process()
+	var/mob/living/carbon/C = occupant
+	if(!istype(C) || C != victim)
+		interrupt_interrogation()
+		return
+	if(prob(10) && !(C.get_eye_protection() > 0))
+		to_chat(C, "<span class='hypnophrase'>[pick(\
+			"...blue... red... green... blue, red, green, blueredgreen<span class='small'>blueredgreen</span>",\
+			"...pretty colors...",\
+			"...you keep hearing words, but you can't seem to understand them...",\
+			"...so peaceful...",\
+			"...an annoying buzz in your ears..."\
+		)]</span>")
+
+/obj/machinery/hypnochair/proc/finish_interrogation()
+	interrogating = FALSE
+	STOP_PROCESSING(SSobj, src)
+	update_icon()
+	var/temp_trigger = trigger_phrase
+	trigger_phrase = "" //Erase evidence, in case the subject is able to look at the panel afterwards
+	audible_message("<span class='notice'>[src] pings!</span>")
+	playsound(src, 'sound/machines/ping.ogg', 30, TRUE)
+
+	if(QDELETED(victim) || victim != occupant)
+		victim = null
+		return
+	victim.cure_blind("hypnochair")
+	REMOVE_TRAIT(victim, TRAIT_DEAF, "hypnochair")
+	if(!(victim.get_eye_protection() > 0))
+		victim.cure_trauma_type(/datum/brain_trauma/severe/hypnotic_trigger, TRAUMA_RESILIENCE_SURGERY)
+		if(prob(90))
+			victim.gain_trauma(new /datum/brain_trauma/severe/hypnotic_trigger(temp_trigger), TRAUMA_RESILIENCE_SURGERY)
+		else
+			victim.gain_trauma(new /datum/brain_trauma/severe/hypnotic_stupor(), TRAUMA_RESILIENCE_SURGERY)
+	victim = null
+
+/obj/machinery/hypnochair/proc/interrupt_interrogation()
+	deltimer(timerid)
+	interrogating = FALSE
+	STOP_PROCESSING(SSobj, src)
+	update_icon()
+
+	if(QDELETED(victim))
+		victim = null
+		return
+	victim.cure_blind("hypnochair")
+	REMOVE_TRAIT(victim, TRAIT_DEAF, "hypnochair")
+	if(!(victim.get_eye_protection() > 0))
+		var/time_diff = world.time - start_time
+		switch(time_diff)
+			if(0 to 100)
+				victim.confused += 10
+				victim.Dizzy(100)
+				victim.blur_eyes(5)
+			if(101 to 200)
+				victim.confused += 15
+				victim.Dizzy(200)
+				victim.blur_eyes(10)
+				if(prob(25))
+					victim.apply_status_effect(/datum/status_effect/trance, rand(50,150), FALSE)
+			if(201 to INFINITY)
+				victim.confused += 20
+				victim.Dizzy(300)
+				victim.blur_eyes(15)
+				if(prob(65))
+					victim.apply_status_effect(/datum/status_effect/trance, rand(50,150), FALSE)
+	victim = null
+
+/obj/machinery/hypnochair/update_icon_state()
+	icon_state = initial(icon_state)
+	if(state_open)
+		icon_state += "_open"
+	if(occupant)
+		if(interrogating)
+			icon_state += "_active"
+		else
+			icon_state += "_occupied"
+
+/obj/machinery/hypnochair/container_resist(mob/living/user)
+	user.changeNext_move(CLICK_CD_BREAKOUT)
+	user.last_special = world.time + CLICK_CD_BREAKOUT
+	user.visible_message("<span class='notice'>You see [user] kicking against the door of [src]!</span>", \
+		"<span class='notice'>You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(600)].)</span>", \
+		"<span class='hear'>You hear a metallic creaking from [src].</span>")
+	if(do_after(user,(600), target = src))
+		if(!user || user.stat != CONSCIOUS || user.loc != src || state_open)
+			return
+		user.visible_message("<span class='warning'>[user] successfully broke out of [src]!</span>", \
+			"<span class='notice'>You successfully break out of [src]!</span>")
+		open_machine()
+
+/obj/machinery/hypnochair/relaymove(mob/user)
+	if(message_cooldown <= world.time)
+		message_cooldown = world.time + 50
+		to_chat(user, "<span class='warning'>[src]'s door won't budge!</span>")
+
+/obj/machinery/hypnochair/MouseDrop_T(mob/target, mob/user)
+	if(user.stat || !Adjacent(user) || !user.Adjacent(target) || !isliving(target) || !user.IsAdvancedToolUser())
+		return
+	if(isliving(user))
+		var/mob/living/L = user
+		if(!(L.mobility_flags & MOBILITY_STAND))
+			return
+	close_machine(target)

code/game/machinery/porta_turret/portable_turret.dm

@@ -679,7 +679,7 @@
 
 /obj/machinery/porta_turret/syndicate/ComponentInitialize()
 	. = ..()
-	AddComponent(/datum/component/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES)
+	AddElement(/datum/element/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES)
 
 /obj/machinery/porta_turret/syndicate/energy
 	icon_state = "standard_stun"
@@ -788,7 +788,7 @@
 
 /obj/machinery/porta_turret/centcom_shuttle/ComponentInitialize()
 	. = ..()
-	AddComponent(/datum/component/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES)
+	AddElement(/datum/element/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES)
 
 /obj/machinery/porta_turret/centcom_shuttle/assess_perp(mob/living/carbon/human/perp)
 	return 0