purge(abductors): makes unfunny aliens funny by removing them

ChaoticOnyx · Feb 4, 2024 · 86f05b7 · 86f05b7
1 parent 6cf7ea5
commit 86f05b7
Show file tree

Hide file tree

Showing 75 changed files with 103 additions and 3,756 deletions.
diff --git a/baystation12.dme b/baystation12.dme
@@ -586,32 +586,6 @@
 #include "code\game\antagonist\outsider\raider.dm"
 #include "code\game\antagonist\outsider\syndicate.dm"
 #include "code\game\antagonist\outsider\wizard.dm"
-#include "code\game\antagonist\outsider\abductor\abductor.dm"
-#include "code\game\antagonist\outsider\abductor\abductee\abductee.dm"
-#include "code\game\antagonist\outsider\abductor\abductee\abductee_objectives.dm"
-#include "code\game\antagonist\outsider\abductor\equipment\abductors_gear.dm"
-#include "code\game\antagonist\outsider\abductor\equipment\abductors_outfits.dm"
-#include "code\game\antagonist\outsider\abductor\equipment\gland.dm"
-#include "code\game\antagonist\outsider\abductor\equipment\orderable_gear.dm"
-#include "code\game\antagonist\outsider\abductor\glands\access.dm"
-#include "code\game\antagonist\outsider\abductor\glands\blood.dm"
-#include "code\game\antagonist\outsider\abductor\glands\chem.dm"
-#include "code\game\antagonist\outsider\abductor\glands\egg.dm"
-#include "code\game\antagonist\outsider\abductor\glands\emp.dm"
-#include "code\game\antagonist\outsider\abductor\glands\heal.dm"
-#include "code\game\antagonist\outsider\abductor\glands\metroid.dm"
-#include "code\game\antagonist\outsider\abductor\glands\mindshock.dm"
-#include "code\game\antagonist\outsider\abductor\glands\plasma.dm"
-#include "code\game\antagonist\outsider\abductor\glands\quantum.dm"
-#include "code\game\antagonist\outsider\abductor\glands\transform.dm"
-#include "code\game\antagonist\outsider\abductor\glands\ventcrawl.dm"
-#include "code\game\antagonist\outsider\abductor\glands\viral.dm"
-#include "code\game\antagonist\outsider\abductor\machinery\camera.dm"
-#include "code\game\antagonist\outsider\abductor\machinery\chem_dispenser.dm"
-#include "code\game\antagonist\outsider\abductor\machinery\console.dm"
-#include "code\game\antagonist\outsider\abductor\machinery\dispenser.dm"
-#include "code\game\antagonist\outsider\abductor\machinery\experiment.dm"
-#include "code\game\antagonist\outsider\abductor\machinery\pad.dm"
 #include "code\game\antagonist\station\changeling.dm"
 #include "code\game\antagonist\station\cult_god.dm"
 #include "code\game\antagonist\station\cultist.dm"
@@ -637,7 +611,6 @@
 #include "code\game\gamemodes\game_mode_latespawn.dm"
 #include "code\game\gamemodes\objective.dm"
 #include "code\game\gamemodes\setupgame.dm"
-#include "code\game\gamemodes\abductors\abductor_datum.dm"
 #include "code\game\gamemodes\calamity\calamity.dm"
 #include "code\game\gamemodes\changeling\absorbed_dna.dm"
 #include "code\game\gamemodes\changeling\biostructure.dm"
@@ -1176,7 +1149,6 @@
 #include "code\game\objects\items\implants\implantchair.dm"
 #include "code\game\objects\items\implants\implanter.dm"
 #include "code\game\objects\items\implants\implantpad.dm"
-#include "code\game\objects\items\implants\implants\abductor.dm"
 #include "code\game\objects\items\implants\implants\adrenaline.dm"
 #include "code\game\objects\items\implants\implants\chem.dm"
 #include "code\game\objects\items\implants\implants\compressed.dm"
@@ -2123,7 +2095,6 @@
 #include "code\modules\mob\living\carbon\human\species\species_hud.dm"
 #include "code\modules\mob\living\carbon\human\species\species_random.dm"
 #include "code\modules\mob\living\carbon\human\species\species_shapeshift.dm"
-#include "code\modules\mob\living\carbon\human\species\outsider\abductors.dm"
 #include "code\modules\mob\living\carbon\human\species\outsider\shadow.dm"
 #include "code\modules\mob\living\carbon\human\species\outsider\vox.dm"
 #include "code\modules\mob\living\carbon\human\species\station\golems.dm"

diff --git a/code/__defines/chemistry.dm b/code/__defines/chemistry.dm
@@ -26,7 +26,6 @@
 #define IS_TAJARA  5
 #define IS_XENOS   6
 #define IS_METROID 8
-#define IS_ABDUCTOR 9
 
 #define CE_STABLE        "stable"       // Inaprovaline
 #define CE_ANTIBIOTIC    "antibiotic"   // Spaceacilin

diff --git a/code/__defines/gamemode.dm b/code/__defines/gamemode.dm
@@ -37,7 +37,6 @@
 #define ANTAG_RANDOM_EXCEPTED   0x800 // If a game mode randomly selects antag types, antag types with this flag should be excluded.
 
 // Mode/antag template macros.
-#define MODE_ABDUCTOR "abductor"
 #define MODE_BORER "borer"
 #define MODE_XENOMORPH "xenomorph"
 #define MODE_LOYALIST "loyalist"

diff --git a/code/__defines/languages.dm b/code/__defines/languages.dm
@@ -17,7 +17,6 @@
 #define LANGUAGE_ROBOT "Robot Talk"
 #define LANGUAGE_DRONE "Drone Talk"
 #define LANGUAGE_LING "Changeling"
-#define LANGUAGE_ABDUCTOR "Mother Ship Mental Interface"
 #define LANGUAGE_SPIDER "Spider"
 
 // Language flags.

diff --git a/code/__defines/misc.dm b/code/__defines/misc.dm
@@ -44,7 +44,6 @@
 #define  STATUS_HUD_OOC 9 // STATUS_HUD without virus DB check for someone being ill.
 #define        LIFE_HUD 10 // STATUS_HUD that only reports dead or alive
 #define        XENO_HUD 11 // Alien embryo status.
-#define       GLAND_HUD 12 // Abductors data hud
 
 // Shuttle moving status.
 #define SHUTTLE_IDLE      0
@@ -310,7 +309,7 @@
 // Bitflags for magic resistance types
 /// Default magic resistance that blocks normal magic (wizard, spells, magical staff projectiles)
 #define MAGIC_RESISTANCE (1<<0)
-/// Tinfoil hat magic resistance that blocks mental magic (telepathy / mind links, mind curses, abductors)
+/// Tinfoil hat magic resistance that blocks mental magic (telepathy / mind links, mind curses)
 #define MAGIC_RESISTANCE_MIND (1<<1)
 /// Holy magic resistance that blocks unholy magic (vampire)
 #define MAGIC_RESISTANCE_HOLY (1<<2)

diff --git a/code/__defines/mobs.dm b/code/__defines/mobs.dm
@@ -305,7 +305,6 @@
 #define SPECIES_SLIMEPERSON "Slimeperson"
 #define SPECIES_LUMINESCENT "Luminescent"
 #define SPECIES_EGYNO       "Egyno"
-#define SPECIES_ABDUCTOR    "Abductor"
 #define SPECIES_SWINE		"Trottine"
 
 #define SPECIES_MONKEY      "Monkey"
@@ -333,7 +332,6 @@
 #define SPECIES_GOLEM_PLASTEEL 		"Plasteel Golem"
 #define SPECIES_GOLEM_TITANIUM 		"Titanium Golem"
 #define SPECIES_GOLEM_PLASTITANIUM 	"Plastitanium Golem"
-#define SPECIES_GOLEM_ALIEN 		"Alien Golem"
 #define SPECIES_GOLEM_WOOD 			"Wood Golem"
 #define SPECIES_GOLEM_URANIUM 		"Uranium Golem"
 #define SPECIES_GOLEM_SAND 			"Sand Golem"

diff --git a/code/_macros.dm b/code/_macros.dm
@@ -36,8 +36,6 @@
 
 #define ishuman(A) istype(A, /mob/living/carbon/human)
 
-#define isabductor(A) (is_species(A, /datum/species/abductor))
-
 #define ispromethean(A) (is_species(A, /datum/species/promethean))
 #define isgolem(A) (is_species(A, /datum/species/golem))
 #define isitem(A) istype(A, /obj/item)

diff --git a/code/datums/mind.dm b/code/datums/mind.dm
@@ -58,7 +58,6 @@
 	var/datum/changeling/changeling		// Changeling holder
 	var/datum/vampire/vampire 			// Vampire holder
 	var/datum/wizard/wizard				// Wizard holder
-	var/datum/abductor/abductor 		// Abductor holder
 	var/weakref/enslaved_to
 	var/rev_cooldown = 0
 

diff --git a/code/game/antagonist/outsider/abductor/abductee/abductee.dm b/code/game/antagonist/outsider/abductor/abductee/abductee.dm
diff --git a/code/game/antagonist/outsider/abductor/abductee/abductee_objectives.dm b/code/game/antagonist/outsider/abductor/abductee/abductee_objectives.dm