TGS Test Merge (#22301)

Author: Yogbot-13

_maps/map_files/DonutStation/DonutStation.dmm

@@ -1015,7 +1015,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" = (
@@ -11738,6 +11738,7 @@
 	name = "Chief Medical Officer RC";
 	pixel_x = -32
 	},
+/obj/machinery/psi_monitor,
 /turf/open/floor/plasteel/cafeteria,
 /area/crew_quarters/heads/cmo)
 "eKS" = (

_maps/map_files/GaxStation/GaxStation.dmm

@@ -7333,6 +7333,7 @@
 /obj/machinery/light_switch{
 	pixel_y = 24
 	},
+/obj/machinery/psi_monitor,
 /turf/open/floor/plasteel,
 /area/security/checkpoint/medical)
 "dxA" = (
@@ -21979,6 +21980,7 @@
 	pixel_x = 26;
 	pixel_y = -4
 	},
+/obj/structure/closet/crate/freezer/blood,
 /turf/open/floor/plasteel/white,
 /area/medical/surgery)
 "kwm" = (
@@ -37505,10 +37507,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" = (
@@ -67230,6 +67231,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
@@ -240572,7 +240577,7 @@ mgB
 qdA
 nTH
 wgD
-dCO
+toR
 mCm
 oqY
 vTt

_maps/map_files/ManateeStation/ManateeStation.dmm

@@ -18880,6 +18880,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 9
 	},
+/obj/machinery/psi_monitor,
 /turf/open/floor/plasteel/cafeteria,
 /area/crew_quarters/heads/cmo)
 "fbD" = (
@@ -41785,7 +41786,6 @@
 /turf/open/floor/eighties,
 /area/maintenance/starboard/fore)
 "mmq" = (
-/obj/structure/bookcase/random/reference,
 /turf/open/floor/wood,
 /area/medical/psych)
 "mmr" = (
@@ -81139,7 +81139,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/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" = (
@@ -67404,7 +67404,6 @@
 /turf/open/floor/plasteel,
 /area/security/prison)
 "vtO" = (
-/obj/structure/bookcase/random/nonfiction,
 /turf/open/floor/wood,
 /area/medical/psych)
 "vtR" = (
@@ -69934,6 +69933,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";
@@ -114323,7 +114329,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,19 @@
+#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_INVOKE "invoke selected"

code/__DEFINES/traits/declarations.dm

@@ -806,6 +806,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/action_button.dm

@@ -59,10 +59,10 @@
 	if(usr.next_click > world.time)
 		return
 	usr.next_click = world.time + 1
-//	var/trigger_flags
-//	if(LAZYACCESS(modifiers, RIGHT_CLICK)) FUCK COMBAT MODE!!!!
-//		trigger_flags |= TRIGGER_SECONDARY_ACTION
-	linked_action.Trigger()
+	var/trigger_flags
+	if(LAZYACCESS(modifiers, RIGHT_CLICK))
+		trigger_flags |= TRIGGER_SECONDARY_ACTION
+	linked_action.Trigger(trigger_flags)
 	SEND_SOUND(usr, get_sfx(SFX_TERMINAL_TYPE))
 	transform = turn(matrix() * 0.9, pick(-8, 8))
 	alpha = 200