adds antagonists to the game

_maps/RandomRuins/SpaceRuins/Academy.dmm

@@ -201,7 +201,7 @@
 /area/awaymission/academy/academyclassroom)
 "du" = (
 /obj/structure/table/wood,
-/obj/item/book/granter/spell/smoke/lesser,
+/obj/item/book/granter/action/spell/smoke/lesser,
 /turf/open/floor/carpet,
 /area/awaymission/academy/academyaft)
 "dw" = (
@@ -358,7 +358,7 @@
 "gg" = (
 /obj/structure/closet/crate,
 /obj/item/crowbar/red,
-/obj/item/book/granter/spell/smoke/lesser,
+/obj/item/book/granter/action/spell/smoke/lesser,
 /turf/open/floor/plasteel/dark,
 /area/awaymission/academy/academyclassroom)
 "gr" = (
@@ -952,7 +952,7 @@
 "kH" = (
 /obj/structure/rack,
 /obj/item/pen/fourcolor,
-/obj/item/book/granter/spell/summonitem,
+/obj/item/book/granter/action/spell/summonitem,
 /turf/open/floor/vault,
 /area/awaymission/academy/academycellar)
 "kJ" = (

_maps/RandomZLevels/VR/vrhub.dmm

@@ -612,7 +612,7 @@
 /turf/open/indestructible,
 /area/awaymission/vr/syndicate)
 "ek" = (
-/obj/item/book/granter/spell/charge,
+/obj/item/book/granter/action/spell/charge,
 /turf/open/floor/bronze{
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
@@ -625,7 +625,7 @@
 	},
 /area/awaymission/vr/syndicate)
 "eq" = (
-/obj/item/book/granter/spell/forcewall,
+/obj/item/book/granter/action/spell/forcewall,
 /turf/open/floor/bronze{
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
@@ -1565,7 +1565,7 @@
 /turf/closed/indestructible/fakeglass,
 /area/awaymission/vr/syndicate)
 "uE" = (
-/obj/item/book/granter/spell/fireball,
+/obj/item/book/granter/action/spell/fireball,
 /turf/open/floor/bronze{
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
@@ -2953,7 +2953,7 @@
 /turf/open/indestructible,
 /area/awaymission/vr/hub)
 "RY" = (
-/obj/item/book/granter/spell/sacredflame,
+/obj/item/book/granter/action/spell/sacredflame,
 /turf/open/floor/bronze{
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
@@ -3054,7 +3054,7 @@
 /turf/open/indestructible,
 /area/awaymission/vr/syndicate)
 "Uf" = (
-/obj/item/book/granter/spell/barnyard,
+/obj/item/book/granter/action/spell/barnyard,
 /turf/open/floor/bronze{
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},

_maps/RandomZLevels/caves.dmm

@@ -188,7 +188,7 @@
 	amount = 25
 	},
 /obj/item/coin/antagtoken,
-/obj/item/book/granter/spell/summonitem{
+/obj/item/book/granter/action/spell/summonitem{
 	name = "an extremely flamboyant book"
 	},
 /turf/open/floor/engine/cult{

_maps/RandomZLevels/research.dmm

@@ -6348,7 +6348,7 @@
 /area/space/nearstation)
 "nb" = (
 /obj/structure/table/wood,
-/obj/item/book/granter/spell/random,
+/obj/item/book/granter/action/spell/random,
 /turf/open/floor/mineral/plasma,
 /area/space/nearstation)
 "nc" = (

_maps/map_files/Yogsmeta/Yogsmeta.dmm

@@ -7933,7 +7933,7 @@
 /area/maintenance/central)
 "avQ" = (
 /obj/structure/table/wood,
-/obj/item/book/granter/spell/smoke/lesser{
+/obj/item/book/granter/action/spell/smoke/lesser{
 	name = "mysterious old book of cloud-chasing"
 	},
 /obj/item/reagent_containers/food/drinks/bottle/holywater{

_maps/map_files/generic/CentCom.dmm

@@ -19677,18 +19677,18 @@
 "aOc" = (
 /obj/structure/glowshroom/glowcap,
 /obj/structure/table/wood,
-/obj/item/book/granter/spell/barnyard,
-/obj/item/book/granter/spell/blind,
-/obj/item/book/granter/spell/charge,
-/obj/item/book/granter/spell/fireball,
-/obj/item/book/granter/spell/forcewall,
-/obj/item/book/granter/spell/knock,
-/obj/item/book/granter/spell/mimery_blockade,
-/obj/item/book/granter/spell/mimery_guns,
-/obj/item/book/granter/spell/mindswap,
-/obj/item/book/granter/spell/sacredflame,
-/obj/item/book/granter/spell/smoke,
-/obj/item/book/granter/spell/summonitem,
+/obj/item/book/granter/action/spell/barnyard,
+/obj/item/book/granter/action/spell/blind,
+/obj/item/book/granter/action/spell/charge,
+/obj/item/book/granter/action/spell/fireball,
+/obj/item/book/granter/action/spell/forcewall,
+/obj/item/book/granter/action/spell/knock,
+/obj/item/book/granter/action/spell/mime/mimery_blockade,
+/obj/item/book/granter/action/spell/mime/mimery_guns,
+/obj/item/book/granter/action/spell/mindswap,
+/obj/item/book/granter/action/spell/sacredflame,
+/obj/item/book/granter/action/spell/smoke,
+/obj/item/book/granter/action/spell/summonitem,
 /obj/item/book/granter/action/origami,
 /obj/item/book_of_babel,
 /turf/open/floor/wood,
@@ -21171,7 +21171,7 @@
 	},
 /obj/structure/table/reinforced,
 /obj/item/voodoo,
-/obj/item/warpwhistle,
+/obj/item/warp_whistle,
 /turf/open/floor/plasteel/bluespace,
 /area/centcom/testchamber)
 "aRb" = (

code/__DEFINES/_click.dm

@@ -0,0 +1,45 @@
+//Defines file for byond click related parameters
+//this is mostly for ease of use and for finding all the things that use say RIGHT_CLICK rather then just searching "right"
+
+//Mouse buttons held
+#define RIGHT_CLICK "right"
+#define MIDDLE_CLICK "middle"
+#define LEFT_CLICK "left"
+
+///Mouse button that was just clicked/released
+///if(modifiers[BUTTON] == LEFT_CLICK)
+#define BUTTON "button"
+
+//Keys held down during the mouse action
+#define CTRL_CLICK "ctrl"
+#define ALT_CLICK "alt"
+#define SHIFT_CLICK "shift"
+
+//Cells involved if using a Grid control
+#define DRAG_CELL "drag-cell"
+#define DROP_CELL "drop-cell"
+
+//The button used for dragging (only sent for unrelated mouse up/down messages during a drag)
+#define DRAG "drag"
+
+//If the mouse is over a link in maptext, or this event is related to clicking such a link
+#define LINK "link"
+
+//Pixel coordinates relative to the icon's position on screen
+#define VIS_X "vis-x"
+#define VIS_Y "vis-y"
+
+//Pixel coordinates within the icon, in the icon's coordinate space
+#define ICON_X "icon-x"
+#define ICON_Y "icon-y"
+
+//Pixel coordinates in screen_loc format ("[tile_x]:[pixel_x],[tile_y]:[pixel_y]")
+#define SCREEN_LOC "screen-loc"
+
+//https://secure.byond.com/docs/ref/info.html#/atom/var/mouse_opacity
+/// Objects will ignore being clicked on regardless of their transparency (used in parallax, lighting effects, holograms, lasers, etc.)
+#define MOUSE_OPACITY_TRANSPARENT 0
+/// Objects will be clicked on if it is the topmost object and the pixel isn't transparent at the position of the mouse (default behavior for 99.99% of game objects)
+#define MOUSE_OPACITY_ICON 1
+/// Objects will be always be clicked on regardless of pixel transparency or other objects at that location (used in space vines, megafauna, storage containers)
+#define MOUSE_OPACITY_OPAQUE 2

code/__DEFINES/actions.dm

@@ -0,0 +1,30 @@
+///Action button checks if hands are unusable
+#define AB_CHECK_HANDS_BLOCKED (1<<0)
+///Action button checks if user is immobile
+#define AB_CHECK_IMMOBILE (1<<1)
+///Action button checks if user is resting
+#define AB_CHECK_LYING (1<<2)
+///Action button checks if user is conscious
+#define AB_CHECK_CONSCIOUS (1<<3)
+///Action button checks if user is incapacitated
+#define AB_CHECK_INCAPACITATED (1<<4)
+
+///Action button triggered with right click
+#define TRIGGER_SECONDARY_ACTION (1<<0)
+
+// Defines for formatting cooldown actions for the stat panel.
+/// The stat panel the action is displayed in.
+#define PANEL_DISPLAY_PANEL "panel"
+/// The status shown in the stat panel.
+/// Can be stuff like "ready", "on cooldown", "active", "charges", "charge cost", etc.
+#define PANEL_DISPLAY_STATUS "status"
+/// The name shown in the stat panel.
+#define PANEL_DISPLAY_NAME "name"
+
+#define ACTION_BUTTON_DEFAULT_BACKGROUND "_use_ui_default_background"
+
+#define UPDATE_BUTTON_NAME (1<<0)
+#define UPDATE_BUTTON_ICON (1<<1)
+#define UPDATE_BUTTON_BACKGROUND (1<<2)
+#define UPDATE_BUTTON_OVERLAY (1<<3)
+#define UPDATE_BUTTON_STATUS (1<<4)

code/__DEFINES/antagonists.dm

@@ -122,8 +122,33 @@
 #define TIER_3 6
 #define TIER_ASCEND 7
 
-//Bloodsuckers
+///Whether a mob is a Bloodsucker
 #define IS_BLOODSUCKER(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/bloodsucker))
+///Whether a mob is a Vassal
 #define IS_VASSAL(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/vassal))
+///Whether a mob is a Favorite Vassal
+#define IS_FAVORITE_VASSAL(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/vassal/favorite))
+///Whether a mob is a Revenge Vassal
+#define IS_REVENGE_VASSAL(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/vassal/revenge))
+///Whether a mob is a Monster Hunter
 #define IS_MONSTERHUNTER(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/monsterhunter))
 
+/// The Classic Wizard wizard loadout.
+#define WIZARD_LOADOUT_CLASSIC "loadout_classic"
+/// Mjolnir's Power wizard loadout.
+#define WIZARD_LOADOUT_MJOLNIR "loadout_hammer"
+/// Fantastical Army wizard loadout.
+#define WIZARD_LOADOUT_WIZARMY "loadout_army"
+/// Soul Tapper wizard loadout.
+#define WIZARD_LOADOUT_SOULTAP "loadout_tap"
+/// Convenient list of all wizard loadouts for unit testing.
+#define ALL_WIZARD_LOADOUTS list( \
+	WIZARD_LOADOUT_CLASSIC, \
+	WIZARD_LOADOUT_MJOLNIR, \
+	WIZARD_LOADOUT_WIZARMY, \
+	WIZARD_LOADOUT_SOULTAP, \
+)
+
+/// Used in logging spells for roundend results
+#define LOG_SPELL_TYPE "type"
+#define LOG_SPELL_AMOUNT "amount"

code/__DEFINES/assert.dm

@@ -0,0 +1,13 @@
+#undef ASSERT
+
+/// Override BYOND's native ASSERT to optionally specify a message
+#define ASSERT(condition, message...) \
+	if (!(condition)) { \
+		CRASH(assertion_message(__FILE__, __LINE__, #condition, ##message)) \
+	}
+
+/proc/assertion_message(file, line, condition, message)
+	if (!isnull(message))
+		message = " - [message]"
+
+	return "[file]:[line]:Assertion failed: [condition][message]"

code/__DEFINES/atom_hud.dm

@@ -63,36 +63,6 @@
 #define DATA_HUD_AI_DETECT					9
 #define DATA_HUD_SECURITY_MEDICAL			10
 
-//antag HUD defines
-#define ANTAG_HUD_CULT			11
-#define ANTAG_HUD_REV			12
-#define ANTAG_HUD_OPS			13
-#define ANTAG_HUD_WIZ			14
-#define ANTAG_HUD_SHADOW		15
-#define ANTAG_HUD_TRAITOR		16
-#define ANTAG_HUD_NINJA			17
-#define ANTAG_HUD_CHANGELING	18
-#define ANTAG_HUD_ABDUCTOR		19
-#define ANTAG_HUD_DEVIL			20
-#define ANTAG_HUD_SINTOUCHED	21
-#define ANTAG_HUD_SOULLESS		22
-#define ANTAG_HUD_CLOCKWORK		23
-#define ANTAG_HUD_BROTHER		24
-#define ANTAG_HUD_HIVE			25
-#define ANTAG_HUD_OBSESSED		26
-#define ANTAG_HUD_FUGITIVE		27
-#define ANTAG_HUD_VAMPIRE		28
-#define ANTAG_HUD_DARKSPAWN		29
-#define ANTAG_HUD_CAPITALIST	30
-#define ANTAG_HUD_COMMUNIST		31
-#define ANTAG_HUD_HERETIC		32
-#define ANTAG_HUD_MINDSLAVE		33
-#define ANTAG_HUD_ZOMBIE		34
-#define ANTAG_HUD_INFILTRATOR	35
-#define ANTAG_HUD_BLOODSUCKER	36
-#define ANTAG_HUD_MHUNTER		37
-#define ANTAG_HUD_BRAINWASHED	38
-
 // Notification action types
 #define NOTIFY_JUMP "jump"
 #define NOTIFY_ATTACK "attack"