TGS Test Merge (#22301)

_maps/map_files/AsteroidStation/AsteroidStation.dmm

@@ -18891,6 +18891,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 9
 	},
+/obj/machinery/psi_monitor,
 /turf/open/floor/plasteel/cafeteria,
 /area/crew_quarters/heads/cmo)
 "fbD" = (
@@ -41824,7 +41825,6 @@
 /turf/open/floor/eighties,
 /area/maintenance/starboard/fore)
 "mmq" = (
-/obj/structure/bookcase/random/reference,
 /turf/open/floor/wood,
 /area/medical/psych)
 "mmr" = (
@@ -81236,7 +81236,7 @@
 	dir = 4;
 	pixel_x = -24
 	},
-/obj/structure/bookcase/random/reference,
+/obj/machinery/psionic_awakener,
 /turf/open/floor/wood,
 /area/medical/psych)
 "yfr" = (

_maps/map_files/DonutStation/DonutStation.dmm

@@ -955,7 +955,7 @@
 /turf/open/floor/plasteel,
 /area/space/nearstation)
 "art" = (
-/obj/structure/bookcase/random/nonfiction,
+/obj/machinery/psionic_awakener,
 /turf/open/floor/wood,
 /area/medical/psych)
 "arA" = (
@@ -11776,6 +11776,7 @@
 	name = "Chief Medical Officer RC";
 	pixel_x = -32
 	},
+/obj/machinery/psi_monitor,
 /turf/open/floor/plasteel/cafeteria,
 /area/crew_quarters/heads/cmo)
 "eLb" = (

_maps/map_files/GaxStation/GaxStation.dmm

@@ -7336,6 +7336,7 @@
 /obj/machinery/light_switch{
 	pixel_y = 24
 	},
+/obj/machinery/psi_monitor,
 /turf/open/floor/plasteel,
 /area/security/checkpoint/medical)
 "dxA" = (
@@ -21992,6 +21993,7 @@
 	pixel_x = 26;
 	pixel_y = -4
 	},
+/obj/structure/closet/crate/freezer/blood,
 /turf/open/floor/plasteel/white,
 /area/medical/surgery)
 "kwm" = (
@@ -37507,10 +37509,10 @@
 /turf/open/floor/plating,
 /area/maintenance/starboard/fore)
 "sep" = (
-/obj/structure/closet/crate/freezer/blood,
 /obj/effect/turf_decal/trimline/blue/filled/line/lower{
 	dir = 6
 	},
+/obj/machinery/psionic_awakener,
 /turf/open/floor/plasteel/white,
 /area/medical/sleeper)
 "seF" = (

_maps/map_files/IceMeta/IceMeta.dmm

@@ -2165,6 +2165,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 10
 	},
+/obj/machinery/psionic_awakener,
 /turf/open/floor/wood,
 /area/medical/psych)
 "aGg" = (
@@ -67300,6 +67301,10 @@
 	},
 /turf/open/floor/plasteel,
 /area/engine/atmos/hfr)
+"toR" = (
+/obj/machinery/psi_monitor,
+/turf/open/floor/wood,
+/area/crew_quarters/heads/cmo)
 "toS" = (
 /obj/machinery/atmospherics/pipe/simple/general/visible{
 	dir = 10
@@ -240624,7 +240629,7 @@ mgB
 qdA
 nTH
 wgD
-dCO
+toR
 mCm
 oqY
 vTt

_maps/map_files/YogStation/YogStation.dmm

@@ -51135,7 +51135,7 @@
 /turf/open/floor/plating,
 /area/maintenance/port)
 "pxM" = (
-/obj/structure/bookcase/random/religion,
+/obj/machinery/psionic_awakener,
 /turf/open/floor/wood,
 /area/medical/psych)
 "pxQ" = (
@@ -67418,7 +67418,6 @@
 /turf/open/floor/plasteel,
 /area/security/prison)
 "vtO" = (
-/obj/structure/bookcase/random/nonfiction,
 /turf/open/floor/wood,
 /area/medical/psych)
 "vtR" = (
@@ -69949,6 +69948,13 @@
 	},
 /turf/open/floor/plasteel,
 /area/security/prison)
+"wlB" = (
+/obj/effect/turf_decal/tile/blue/opposingcorners{
+	dir = 1
+	},
+/obj/machinery/psi_monitor,
+/turf/open/floor/plasteel/cafeteria,
+/area/crew_quarters/heads/cmo)
 "wlK" = (
 /obj/machinery/camera/motion{
 	c_tag = "Armory External";
@@ -114338,7 +114344,7 @@ jXL
 wgu
 pbD
 elr
-vcC
+wlB
 dmN
 lcC
 guV

code/__DEFINES/atom_hud.dm

@@ -45,7 +45,9 @@
 /// Displays launchpads' targeting reticle
 #define DIAG_LAUNCHPAD_HUD "23"
 //for antag huds. these are used at the /mob level
-#define ANTAG_HUD		"24"
+#define ANTAG_HUD		"23"
+/// psi control implant
+#define IMPPSI_HUD	"24"
 
 //by default everything in the hud_list of an atom is an image
 //a value in hud_list with one of these will change that behavior

code/__DEFINES/modular_computer.dm

@@ -29,6 +29,7 @@
 #define PROGRAM_CATEGORY_ENGINEERING "Engineering"
 #define PROGRAM_CATEGORY_SUPPLY "Supply"
 #define PROGRAM_CATEGORY_SCIENCE "Science"
+#define PROGRAM_CATEGORY_CREW "Crew"
 
 ///The default amount a program should take in cell use.
 #define PROGRAM_BASIC_CELL_USE 15

code/__DEFINES/psi.dm

@@ -0,0 +1,20 @@
+#define PSI_COERCION           "coercion"
+#define PSI_PSYCHOKINESIS      "psychokinesis"
+#define PSI_REDACTION          "redaction"
+#define PSI_ENERGISTICS        "energistics"
+
+#define PSI_RANK_BLUNT         0
+#define PSI_RANK_LATENT        1
+#define PSI_RANK_OPERANT       2
+#define PSI_RANK_MASTER        3
+#define PSI_RANK_GRANDMASTER   4
+#define PSI_RANK_PARAMOUNT     5
+
+#define PSI_IMPLANT_AUTOMATIC  "Security Level Derived"
+#define PSI_IMPLANT_SHOCK      "Issue Neural Shock"
+#define PSI_IMPLANT_WARN       "Issue Reprimand"
+#define PSI_IMPLANT_LOG        "Log Incident"
+#define PSI_IMPLANT_DISABLED   "Disabled"
+
+#define COMSIG_PSI_SELECTION "select action"
+#define COMSIG_PSI_INVOKE "invoke selected"

code/__DEFINES/traits/declarations.dm

@@ -799,6 +799,10 @@
 /// determines whether or not objects are haunted and teleport/attack randomly
 #define TRAIT_HAUNTED "haunted"
 
+//quirk traits
+#define TRAIT_PSIONICALLY_DEAFENED "Psionically Deafened"
+/// Can never have psionics, but is pretty much immune to direct tampering by them
+#define TRAIT_PSIONICALLY_IMMUNE "Psionically Immune"
 
 /// This mob always lands on their feet when they fall, for better or for worse.
 #define TRAIT_CATLIKE_GRACE "catlike_grace"

code/_onclick/hud/screen_objects.dm

@@ -284,6 +284,8 @@
 		var/obj/item/I = hud.mymob.get_active_held_item()
 		if(I)
 			I.Click(location, control, params)
+		else
+			hud.mymob.attack_empty_hand(hud.mymob.active_hand_index)
 	else
 		hud.mymob.swap_hand(held_index)
 	return 1

code/_onclick/other_mobs.dm

@@ -5,6 +5,9 @@
 	Otherwise pretty standard.
 */
 /mob/living/carbon/human/UnarmedAttack(atom/A, proximity, modifiers)
+	if(psi)
+		if(SEND_SIGNAL(src, COMSIG_PSI_INVOKE, A, proximity, modifiers))
+			return
 	if(HAS_TRAIT(src, TRAIT_HANDS_BLOCKED))
 		if(src == A)
 			check_self_for_injuries()
@@ -47,6 +50,14 @@
 
 	A.attack_hand(src, modifiers)
 
+/mob/living/carbon/human/attack_empty_hand()
+	if(psi)
+		SEND_SIGNAL(src, COMSIG_PSI_SELECTION)
+
+/mob/living/carbon/human/RangedAttack(atom/A, params)
+	if(psi)
+		SEND_SIGNAL(src, COMSIG_PSI_INVOKE, A, FALSE, params)
+
 //Return TRUE to cancel other attack hand effects that respect it.
 /atom/proc/attack_hand(mob/user, modifiers)
 	. = FALSE
@@ -57,6 +68,9 @@
 	if(interaction_flags_atom & INTERACT_ATOM_ATTACK_HAND)
 		. = _try_interact(user, modifiers)
 
+/mob/proc/attack_empty_hand(hand)
+	return
+
 /// When the user uses their hand on an item while holding right-click
 /// Returns a SECONDARY_ATTACK_* value.
 /atom/proc/attack_hand_secondary(mob/user, modifiers)

code/controllers/subsystem/backrooms.dm

@@ -8,12 +8,12 @@ SUBSYSTEM_DEF(backrooms)
 
 	//associative list of objects and how much they sell for
 	var/list/golden_loot = list( 
-		/obj/item/statuebust = 1000,
-		/obj/item/reagent_containers/food/snacks/urinalcake = 1000,
+		/obj/item/statuebust = 2000,
+		/obj/item/reagent_containers/food/snacks/urinalcake = 2000,
 		/obj/item/bigspoon = 4000,
 		/obj/item/reagent_containers/food/snacks/burger/rat = 1200,
 		/obj/item/extinguisher = 2500,
-		/obj/item/toy/plush/lizard/azeel = 5000
+		/obj/item/toy/plush/lizard/azeel = 10000
 	)
 
 /datum/controller/subsystem/backrooms/Initialize(timeofday)

code/controllers/subsystem/processing/psi.dm

@@ -0,0 +1,38 @@
+GLOBAL_LIST_INIT(psychic_ranks_to_strings, list("Latent", "Operant", "Masterclass", "Grandmasterclass", "Paramount"))
+
+PROCESSING_SUBSYSTEM_DEF(psi)
+	name = "Psychics"
+	// priority = SS_PRIORITY_PSYCHICS
+	flags = SS_POST_FIRE_TIMING | SS_BACKGROUND
+
+	var/list/faculties_by_id =        list()
+	var/list/faculties_by_name =      list()
+	var/list/all_aura_images =        list()
+	var/list/all_psi_complexes =      list()
+	var/list/psi_dampeners =          list()
+	var/list/psi_monitors =           list()
+	var/list/armour_faculty_by_type = list()
+	var/list/faculties_by_intent  = list()
+
+/datum/controller/subsystem/processing/psi/New()
+	NEW_SS_GLOBAL(SSpsi)
+
+/datum/controller/subsystem/processing/psi/proc/get_faculty(faculty)
+	return faculties_by_name[faculty] || faculties_by_id[faculty]
+
+/datum/controller/subsystem/processing/psi/Initialize()
+	. = ..()
+
+	var/list/faculties = subtypesof(/datum/psionic_faculty)
+	for(var/ftype in faculties)
+		var/datum/psionic_faculty/faculty = new ftype
+		faculties_by_id[faculty.id] = faculty
+		faculties_by_name[faculty.name] = faculty
+		faculties_by_intent[faculty.associated_intent] = faculty.id
+
+	var/list/powers = subtypesof(/datum/psionic_power)
+	for(var/ptype in powers)
+		var/datum/psionic_power/power = new ptype
+		if(power.faculty)
+			var/datum/psionic_faculty/faculty = get_faculty(power.faculty)
+			faculty?.powers |= power

code/controllers/subsystem/processing/quirks.dm

@@ -28,7 +28,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 		list("Cybernetic Organ (Lungs)", "Body Purist"),
 		list("Cybernetic Organ (Heart)", "Body Purist"),
 		list("Cybernetic Organ (Liver)", "Body Purist"),
-		list("Upgraded Cybernetic Organ", "Body Purist")
+		list("Upgraded Cybernetic Organ", "Body Purist"),
 	) 
 
 /datum/controller/subsystem/processing/quirks/Initialize(timeofday)