remove plasmamen (#1174)

DaedalusDock · Dec 30, 2024 · b99a73e · b99a73e
1 parent b0fd390
commit b99a73e
Show file tree

Hide file tree

Showing 107 changed files with 64 additions and 2,425 deletions.
diff --git a/_maps/map_files/CTF/downtown.dmm b/_maps/map_files/CTF/downtown.dmm
@@ -764,19 +764,13 @@
 /obj/structure/rack{
 	resistance_flags = 64
 	},
-/obj/item/clothing/head/helmet/space/plasmaman/captain{
-	name = "blue plasma envirosuit helmet"
-	},
 /obj/effect/turf_decal/siding/wood,
 /turf/open/floor/carpet/blue,
 /area/centcom/ctf)
 "oG" = (
 /obj/structure/rack{
 	resistance_flags = 64
 	},
-/obj/item/clothing/head/helmet/space/plasmaman/security{
-	name = "red plasma envirosuit helmet"
-	},
 /obj/effect/turf_decal/siding/wood,
 /turf/open/floor/carpet/red,
 /area/centcom/ctf)

diff --git a/_maps/map_files/Theseus/Theseus.dmm b/_maps/map_files/Theseus/Theseus.dmm
@@ -53721,7 +53721,6 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
 	},
-/obj/item/mod/module/plasma_stabilizer,
 /obj/item/mod/module/thermal_regulator,
 /obj/effect/turf_decal/tile/neutral/half,
 /turf/open/floor/iron,

diff --git a/_maps/map_files/Theseus/medbay_holder.dmm b/_maps/map_files/Theseus/medbay_holder.dmm
@@ -5953,7 +5953,6 @@
 	name = "First Aid Supplies";
 	req_access_txt = "5"
 	},
-/obj/item/mod/module/plasma_stabilizer,
 /obj/item/mod/module/thermal_regulator,
 /turf/open/floor/iron/dark,
 /area/station/medical/storage)

diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
@@ -623,16 +623,6 @@
 	anchored = 1;
 	name = "Plasmaman suits"
 	},
-/obj/item/clothing/under/plasmaman,
-/obj/item/clothing/under/plasmaman/engineering,
-/obj/item/clothing/under/plasmaman/botany,
-/obj/item/clothing/under/plasmaman/janitor,
-/obj/item/clothing/under/plasmaman/chef,
-/obj/item/clothing/head/helmet/space/plasmaman,
-/obj/item/clothing/head/helmet/space/plasmaman/engineering,
-/obj/item/clothing/head/helmet/space/plasmaman/botany,
-/obj/item/clothing/head/helmet/space/plasmaman/janitor,
-/obj/item/clothing/head/helmet/space/plasmaman/white,
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
 	},
@@ -2635,11 +2625,6 @@
 /obj/item/clothing/mask/breath,
 /obj/item/clothing/mask/breath,
 /obj/item/clothing/mask/breath,
-/obj/item/tank/internals/plasmaman/belt/full,
-/obj/item/tank/internals/plasmaman/belt/full,
-/obj/item/tank/internals/plasmaman/belt/full,
-/obj/item/tank/internals/plasmaman/belt/full,
-/obj/item/tank/internals/plasmaman/belt/full,
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
 	},

diff --git a/code/__DEFINES/atmospherics/atmos_piping.dm b/code/__DEFINES/atmospherics/atmos_piping.dm
@@ -35,8 +35,6 @@
 #define TANK_MAX_RELEASE_PRESSURE (ONE_ATMOSPHERE*3)
 /// The default initial value gas tanks release valves are set to. (At least the ones containing pure plasma/oxygen.)
 #define TANK_DEFAULT_RELEASE_PRESSURE (ONE_ATMOSPHERE*O2STANDARD)
-/// The default initial value gas plasmamen tanks releases valves are set to.
-#define TANK_PLASMAMAN_RELEASE_PRESSURE 4
 /// The internal temperature in kelvins at which a handheld gas tank begins to take damage.
 #define TANK_MELT_TEMPERATURE 1000000
 /// The internal pressure in kPa at which a handheld gas tank begins to take damage.

diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm
@@ -182,7 +182,6 @@ GLOBAL_LIST_INIT(detective_vest_allowed, typecacheof(list(
 	/obj/item/storage/fancy/cigarettes,
 	/obj/item/taperecorder,
 	/obj/item/tank/internals/emergency_oxygen,
-	/obj/item/tank/internals/plasmaman,
 	/obj/item/storage/belt/holster/shoulder,
 	/obj/item/storage/belt/holster/shoulder/nukie,
 	/obj/item/storage/belt/holster/shoulder/thermal,
@@ -199,7 +198,6 @@ GLOBAL_LIST_INIT(security_vest_allowed, typecacheof(list(
 	/obj/item/reagent_containers/spray/pepper,
 	/obj/item/restraints/handcuffs,
 	/obj/item/tank/internals/emergency_oxygen,
-	/obj/item/tank/internals/plasmaman,
 	/obj/item/storage/belt/holster/shoulder,
 	/obj/item/storage/belt/holster/shoulder/nukie,
 	/obj/item/storage/belt/holster/shoulder/thermal,

diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
@@ -81,7 +81,6 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
 //Human sub-species
 #define isabductor(A) (is_species(A, /datum/species/abductor))
 #define islizard(A) (is_species(A, /datum/species/lizard))
-#define isplasmaman(A) (is_species(A, /datum/species/plasmaman))
 #define isvox(A) (is_species(A, /datum/species/vox))
 #define ispodperson(A) (is_species(A, /datum/species/pod))
 #define isflyperson(A) (is_species(A, /datum/species/fly))

diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
@@ -141,7 +141,6 @@
 #define SPECIES_MONKEY "monkey"
 #define SPECIES_MOTH "moth"
 #define SPECIES_MUSHROOM "mush"
-#define SPECIES_PLASMAMAN "plasmaman"
 #define SPECIES_PODPERSON "pod"
 #define SPECIES_SAURIAN "saurian"
 #define SPECIES_SHADOW "shadow"

diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
@@ -394,8 +394,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_KISS_OF_DEATH "kiss_of_death"
 /// Used to activate french kissing
 #define TRAIT_GARLIC_BREATH "kiss_of_garlic_death"
-/// Used on limbs in the process of turning a human into a plasmaman while in plasma lava
-#define TRAIT_PLASMABURNT "plasma_burnt"
 /// Addictions don't tick down, basically they're permanently addicted
 #define TRAIT_HOPELESSLY_ADDICTED "hopelessly_addicted"
 /// Their eyes glow an unnatural red colour. Currently used to set special examine text on humans. Does not guarantee the mob's eyes are coloured red, nor that there is any visible glow on their character sprite.

diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm
@@ -158,13 +158,6 @@
 		if(!findname(.))
 			break
 
-/proc/random_unique_plasmaman_name(attempts_to_find_unique_name=10)
-	for(var/i in 1 to attempts_to_find_unique_name)
-		. = capitalize(plasmaman_name())
-
-		if(!findname(.))
-			break
-
 /proc/random_unique_ethereal_name(attempts_to_find_unique_name=10)
 	for(var/i in 1 to attempts_to_find_unique_name)
 		. = capitalize(ethereal_name())

diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm
@@ -10,9 +10,6 @@
 		tempname += random_capital_letter()
 	return tempname
 
-/proc/plasmaman_name()
-	return "[pick(GLOB.plasmaman_names)] \Roman[rand(1,99)]"
-
 /proc/moth_name()
 	return "[pick(GLOB.moth_first)] [pick(GLOB.moth_last)]"
 

diff --git a/code/_globalvars/lists/names.dm b/code/_globalvars/lists/names.dm
@@ -17,7 +17,6 @@ GLOBAL_LIST_INIT(carp_names, world.file2list("strings/names/carp.txt"))
 GLOBAL_LIST_INIT(golem_names, world.file2list("strings/names/golem.txt"))
 GLOBAL_LIST_INIT(moth_first, world.file2list("strings/names/moth_first.txt"))
 GLOBAL_LIST_INIT(moth_last, world.file2list("strings/names/moth_last.txt"))
-GLOBAL_LIST_INIT(plasmaman_names, world.file2list("strings/names/plasmaman.txt"))
 GLOBAL_LIST_INIT(ethereal_names, world.file2list("strings/names/ethereal.txt"))
 GLOBAL_LIST_INIT(posibrain_names, world.file2list("strings/names/posibrain.txt"))
 GLOBAL_LIST_INIT(nightmare_names, world.file2list("strings/names/nightmare.txt"))

diff --git a/code/_globalvars/phobias.dm b/code/_globalvars/phobias.dm
@@ -129,7 +129,6 @@ GLOBAL_LIST_INIT(phobia_objs, list(
 		/obj/item/clothing/mask/gas/clown_hat,
 		/obj/item/clothing/shoes/clown_shoes,
 		/obj/item/clothing/suit/chaplainsuit/clownpriest,
-		/obj/item/clothing/under/plasmaman/clown,
 		/obj/item/clothing/under/rank/civilian/clown,
 		/obj/item/food/cheesiehonkers,
 		/obj/item/food/pie/cream,
@@ -493,7 +492,6 @@ GLOBAL_LIST_INIT(phobia_species, list(
 	"lizards" = typecacheof(list(/datum/species/lizard)),
 	"robots" = typecacheof(list(/datum/species/android)),
 	"skeletons" = typecacheof(list(
-		/datum/species/plasmaman,
 		/datum/species/skeleton,
 	)),
 ))

diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm
@@ -169,7 +169,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 	),
 	/obj/item/bodypart = list(
 		"TRAIT_PARALYSIS" = TRAIT_PARALYSIS,
-		"TRAIT_PLASMABURNT" = TRAIT_PLASMABURNT,
 		),
 	/obj/item = list(
 		"TRAIT_NODROP" = TRAIT_NODROP,

diff --git a/code/controllers/subsystem/economy.dm b/code/controllers/subsystem/economy.dm
@@ -300,9 +300,9 @@ SUBSYSTEM_DEF(economy)
 		var/list/possible_names = list(
 			"human" = random_unique_name(),
 			"lizard" = random_unique_lizard_name(),
-			"plasmaman" = random_unique_plasmaman_name(),
 			"ethereal" = random_unique_ethereal_name(),
-			"moth" = random_unique_moth_name(),)
+			"moth" = random_unique_moth_name(),
+		)
 		paper_victim_species = pick(possible_names)
 		paper_victim = possible_names[paper_victim_species]
 		all_tracked_data += "victim"

diff --git a/code/datums/martial/plasma_fist.dm b/code/datums/martial/plasma_fist.dm
diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
@@ -380,7 +380,6 @@
 	var/static/list/datum/design/hacked_designs
 	if(!hacked_designs)
 		var/list/L = list(
-			/datum/design/plasmaman_tank_belt,
 			/datum/design/large_welding_tool,
 			/datum/design/handcuffs,
 			/datum/design/receiver,
@@ -435,7 +434,6 @@
 		/datum/design/airlock_painter/decal/tile,
 		/datum/design/paint_sprayer,
 		/datum/design/emergency_oxygen,
-		/datum/design/plasmaman_tank_belt,
 		/datum/design/iron,
 		/datum/design/glass,
 		/datum/design/rglass,
@@ -500,7 +498,6 @@
 		/datum/design/beacon,
 		/datum/design/plasticducky,
 		/datum/design/gas_filter,
-		/datum/design/plasmaman_gas_filter,
 		/datum/design/oven_tray,
 		/datum/design/data,
 	)