erp removals PR #5434634245234234235564523453564565675987432958230705825602345902348759823468=2597684576832457546872968y934805732409587-3246734-567543563456

code/__DEFINES/time.dm

@@ -18,7 +18,6 @@
 #define VALENTINES				"Valentine's Day"
 #define APRIL_FOOLS				"April Fool's Day"
 #define EASTER					"Easter"
-#define PRIDE_MONTH				"Pride Month"
 #define HALLOWEEN				"Halloween"
 #define CHRISTMAS				"Christmas"
 #define FESTIVE_SEASON			"Festive Season"

code/game/objects/structures/ghost_role_spawners.dm

@@ -690,20 +690,6 @@
 	id = /obj/item/card/id/no_banking
 	r_hand = /obj/item/storage/box/syndie_kit/chameleon/ghostcafe
 
-
-/* No
-/datum/outfit/ghostcafe/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source)
-	..()
-	var/suited = !preference_source || preference_source.prefs.jumpsuit_style == PREF_SUIT
-	if (CONFIG_GET(flag/grey_assistants))
-		uniform = suited ? /obj/item/clothing/under/color/grey : /obj/item/clothing/under/color/jumpskirt/grey
-	else
-		if(SSevents.holidays && SSevents.holidays[PRIDE_MONTH])
-			uniform = suited ? /obj/item/clothing/under/color/rainbow : /obj/item/clothing/under/color/jumpskirt/rainbow
-		else
-			uniform = suited ? /obj/item/clothing/under/color/random : /obj/item/clothing/under/color/jumpskirt/random
-*/
-
 /obj/item/storage/box/syndie_kit/chameleon/ghostcafe
 	name = "cafe costuming kit"
 	desc = "Look just the way you did in life - or better!"

code/modules/antagonists/nukeop/equipment/borgchameleon.dm

@@ -97,14 +97,6 @@
 			if("Heavy")
 				disguise = "heavyeng"
 				disguise_icon_override = 'modular_citadel/icons/mob/robots.dmi'
-			if("Pup Dozer")
-				disguise = "pupdozer"
-				disguise_icon_override = 'modular_skyrat/icons/mob/widerobot.dmi'
-				disguise_pixel_offset = -16
-			if("Vale")
-				disguise = "valeeng"
-				disguise_icon_override = 'modular_skyrat/icons/mob/widerobot.dmi'
-				disguise_pixel_offset = -16
 		animation_playing = TRUE
 		to_chat(user, "<span class='notice'>You activate \the [src].</span>")
 		playsound(src, 'sound/effects/seedling_chargeup.ogg', 100, TRUE, -6)

code/modules/client/preferences.dm

@@ -26,7 +26,7 @@ GLOBAL_LIST_INIT(combat_music_options, list( // Skyrat addition
 		"Hot Plates" = 'modular_skyrat/sound/music/hot_plates.ogg',
 		"Thunderdome" = 'modular_skyrat/sound/music/thunderdome.ogg',
 		"Death Squad" ='modular_skyrat/sound/music/deathsquads.ogg',
-		"Robocop Gameboy Theme" ='modular_skyrat/sound/music/robocop_theme.ogg',
+		"Robocop Gameboy Theme (title2)" ='modular_skyrat/sound/music/robocop_theme.ogg',
 		"Brawlin" ='modular_skyrat/sound/music/brawlin.ogg',
 		"War Season" ='modular_skyrat/sound/music/war_season.ogg',
 		"Fatal Conflict" ='modular_skyrat/sound/music/fatal_conflict.ogg',
@@ -132,10 +132,6 @@ GLOBAL_LIST_INIT(combat_music_options, list( // Skyrat addition
 	var/bloodcolor = ""
 	var/skyrat_ooc_notes = ""
 	var/erppref = "Ask"
-	var/nonconpref = "Ask"
-	var/vorepref = "Ask"
-	var/extremepref = "No" //This is for extreme shit, maybe even literal shit, better to keep it on no by default
-	var/extremeharm = "No" //If "extreme content" is enabled, this option serves as a toggle for the related interactions to cause damage or not
 	var/general_records = ""
 	var/security_records = ""
 	var/medical_records = ""
@@ -1365,9 +1361,6 @@ GLOBAL_LIST_INIT(combat_music_options, list( // Skyrat addition
 			dat += "<b>Allow Lewd Verbs:</b> <a href='?_src_=prefs;preference=verb_consent'>[(toggles & VERB_CONSENT) ? "Yes":"No"]</a><br>" // Skyrat - ERP Mechanic Addition
 			dat += "<b>Mute Lewd Verb Sounds:</b> <a href='?_src_=prefs;preference=mute_lewd_verb_sounds'>[(toggles & LEWD_VERB_SOUNDS) ? "Yes":"No"]</a><br>" // Skyrat - ERP Mechanic Addition
 			dat += "<b>Arousal:</b><a href='?_src_=prefs;preference=arousable'>[arousable == TRUE ? "Enabled" : "Disabled"]</a><BR>"
-			dat += "<b>Voracious MediHound sleepers:</b> <a href='?_src_=prefs;preference=hound_sleeper'>[(cit_toggles & MEDIHOUND_SLEEPER) ? "Yes" : "No"]</a><br>"
-			dat += "<b>Hear Vore Sounds:</b> <a href='?_src_=prefs;preference=toggleeatingnoise'>[(cit_toggles & EATING_NOISES) ? "Yes" : "No"]</a><br>"
-			dat += "<b>Hear Vore Digestion Sounds:</b> <a href='?_src_=prefs;preference=toggledigestionnoise'>[(cit_toggles & DIGESTION_NOISES) ? "Yes" : "No"]</a><br>"
 			dat += "<b>Forced Feminization:</b> <a href='?_src_=prefs;preference=feminization'>[(cit_toggles & FORCED_FEM) ? "Allowed" : "Disallowed"]</a><br>"
 			dat += "<b>Forced Masculinization:</b> <a href='?_src_=prefs;preference=masculinization'>[(cit_toggles & FORCED_MASC) ? "Allowed" : "Disallowed"]</a><br>"
 			dat += "<b>Lewd Hypno:</b> <a href='?_src_=prefs;preference=hypno'>[(cit_toggles & HYPNO) ? "Allowed" : "Disallowed"]</a><br>"
@@ -1380,11 +1373,6 @@ GLOBAL_LIST_INIT(combat_music_options, list( // Skyrat addition
 			dat += "<b>Hypno:</b> <a href='?_src_=prefs;preference=never_hypno'>[(cit_toggles & NEVER_HYPNO) ? "Disallowed" : "Allowed"]</a><br>"
 			dat += "<b>Aphrodisiacs:</b> <a href='?_src_=prefs;preference=aphro'>[(cit_toggles & NO_APHRO) ? "Disallowed" : "Allowed"]</a><br>"
 			dat += "<b>Ass Slapping:</b> <a href='?_src_=prefs;preference=ass_slap'>[(cit_toggles & NO_ASS_SLAP) ? "Disallowed" : "Allowed"]</a><br>"
-			//SKYRAT EDIT
-			dat += 	"<b>Extreme ERP verbs :</b> <a href='?_src_=prefs;preference=extremepref'>[extremepref]</a><br>" // https://youtu.be/0YrU9ASVw6w
-			if(extremepref != "No")
-				dat += "<b><span style='color: #e60000;'Harmful ERP verbs :</b> <a href='?_src_=prefs;preference=extremeharm'>[extremeharm]</a><br>"
-			//END OF SKYRAT EDIT
 			dat += "</tr></table>"
 			dat += "<br>"
 		if(5) // Custom keybindings
@@ -1966,7 +1954,7 @@ GLOBAL_LIST_INIT(combat_music_options, list( // Skyrat addition
 //SKYRAT EDIT - species menu cool
 /datum/preferences/proc/SetSpecies(mob/user)
 	var/list/dat = list()
-	dat += "<center><h2>Choose a species</h2></center>"
+	dat += "<center><h2>Choose a Species</h2></center>"
 	dat += "<center><a href='?_src_=prefs;preference=language;task=close'>Done</a></center>"
 	dat += "<hr>"
 	for(var/name in GLOB.roundstart_race_names)
@@ -3219,32 +3207,14 @@ GLOBAL_LIST_INIT(combat_music_options, list( // Skyrat addition
 				if("nameless")
 					nameless = !nameless
 
-				if("erp_pref")
+				if("erp_pref") // Quickly! Bully this user!
 					switch(erppref)
 						if("Yes")
 							erppref = "Ask"
 						if("Ask")
 							erppref = "No"
 						if("No")
 							erppref = "Yes"
-				//Skyrat edit - *someone* offered me actual money for this shit
-				if("extremepref") //i hate myself for doing this
-					switch(extremepref) //why the fuck did this need to use cycling instead of input from a list
-						if("Yes")		//seriously this confused me so fucking much
-							extremepref = "Ask"
-						if("Ask")
-							extremepref = "No"
-							extremeharm = "No"
-						if("No")
-							extremepref = "Yes"
-				if("extremeharm")
-					switch(extremeharm)
-						if("Yes")	//this is cursed code
-							extremeharm = "No"
-						if("No")
-							extremeharm = "Yes"
-					if(extremepref == "No")
-						extremeharm = "No"
 				if("auto_hiss")
 					auto_hiss = !auto_hiss
 				//END CITADEL EDIT

code/modules/clothing/head/beanie.dm

@@ -74,7 +74,7 @@
 	name = "durathread beanie"
 	desc = "A beanie made from durathread, its resilient fibres provide some protection to the wearer."
 	icon_state = "beaniedurathread"
-	armor = list("melee" = 25, "bullet" = 10, "laser" = 20,"energy" = 10, "bomb" = 30, "bio" = 15, "rad" = 20, "fire" = 100, "acid" = 50, "wound" = 15)
+	armor = list("melee" = 15, "bullet" = 10, "laser" = 10,"energy" = 10, "bomb" = 20, "bio" = 15, "rad" = 10, "fire" = 5, "acid" = 50, "wound" = 15)
 
 /obj/item/clothing/head/beanie/waldo
 	name = "red striped bobble hat"

code/modules/clothing/head/helmet.dm

@@ -407,10 +407,40 @@
 	icon_state = "policehelm"
 	dynamic_hair_suffix = ""
 
-/obj/item/clothing/head/helmet/snowflake
+/obj/item/clothing/head/helmet/snowflake // Because every fucking helmet doesn't need to be reskinnable
 	name = "special aesthetic polymer helmet"
 	desc = "A helmet designed with a special hyper-ashesio-warpweave-foldabila-compress-contracto-flex polymer(tm) for semi-maximum customization exactly once. However, it's not much better than a lightless hardhat."
 	icon_state = "helmetalt"
 	item_state = "helmetalt"
 	armor = list("melee" = 10, "bullet" = 10, "laser" = 10,"energy" = 10, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 40, "wound" = 5)
 	dog_fashion = null
+	can_flashlight = 0 //for the sake of reskins
+	armor = list("melee" = 35, "bullet" = 30, "laser" = 30,"energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "wound" = 15)
+	unique_reskin_icons = list(
+	"Default" = 'icons/obj/clothing/hats.dmi',
+	"Tactical" = 'modular_skyrat/icons/obj/clothing/hats.dmi',
+	"Press" = 'modular_skyrat/icons/obj/clothing/hats.dmi',
+	"HECU" = 'modular_skyrat/icons/obj/clothing/hats.dmi',
+	"HECU Green" = 'modular_skyrat/icons/obj/clothing/hats.dmi'
+	)
+	unique_reskin_worn = list(
+	"Default" = 'icons/mob/clothing/head.dmi',
+	"Tactical" = 'modular_skyrat/icons/mob/clothing/head.dmi',
+	"Press" = 'modular_skyrat/icons/mob/clothing/head.dmi',
+	"HECU" = 'modular_skyrat/icons/mob/clothing/head.dmi',
+	"HECU Green" = 'modular_skyrat/icons/mob/clothing/head.dmi'
+	)
+	unique_reskin_worn_anthro = list(
+	"Default" = 'icons/mob/clothing/head.dmi',
+	"Tactical" = 'modular_skyrat/icons/mob/clothing/head.dmi',
+	"Press" = 'modular_skyrat/icons/mob/clothing/head.dmi',
+	"HECU" = 'modular_skyrat/icons/mob/clothing/head.dmi',
+	"HECU Green" = 'modular_skyrat/icons/mob/clothing/head.dmi'
+	)
+	unique_reskin = list(
+	"Default" = "helmet",
+	"Tactical" = "epic_helmet",
+	"Press" = "press_helmet",
+	"HECU" = "hecu_helmet",
+	"HECU Green" = "hecu_helmet_green"
+	)

code/modules/clothing/suits/armor.dm

@@ -57,6 +57,38 @@
 	icon_state = "armor_snowflake"
 	item_state = "armor"
 	armor = list("melee" = 15, "bullet" = 20, "laser" = 10, "energy" = 5, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 40, "wound" = 10)
+	unique_reskin_icons = list(
+	"Default" = 'icons/obj/clothing/suits.dmi',
+	"Tactical" = 'modular_skyrat/icons/obj/clothing/suits.dmi',
+	"Tactical Classic" = 'modular_skyrat/icons/obj/clothing/suits.dmi',
+	"Press" = 'modular_skyrat/icons/obj/clothing/suits.dmi',
+	"HECU" = 'modular_skyrat/icons/obj/clothing/suits.dmi',
+	"Bloody" = 'modular_skyrat/icons/obj/clothing/suits.dmi'
+	)
+	unique_reskin_worn = list(
+	"Default" = 'icons/mob/clothing/suit.dmi',
+	"Tactical" = 'modular_skyrat/icons/mob/clothing/suit.dmi',
+	"Tactical Classic" = 'modular_skyrat/icons/mob/clothing/suit.dmi',
+	"Press" = 'modular_skyrat/icons/mob/clothing/suit.dmi',
+	"HECU" = 'modular_skyrat/icons/mob/clothing/suit.dmi',
+	"Bloody" = 'modular_skyrat/icons/mob/clothing/suit.dmi'
+	)
+	unique_reskin_worn_anthro = list(
+	"Default" = 'icons/mob/clothing/suit.dmi',
+	"Tactical" = 'modular_skyrat/icons/mob/clothing/suit.dmi',
+	"Tactical Classic" = 'modular_skyrat/icons/mob/clothing/suit.dmi',
+	"Press" = 'modular_skyrat/icons/mob/clothing/suit.dmi',
+	"HECU" = 'modular_skyrat/icons/mob/clothing/suit.dmi',
+	"Bloody" = 'modular_skyrat/icons/mob/clothing/suit.dmi'
+	)
+	unique_reskin = list(
+	"Default" = "armor",
+	"Tactical" = "epic_armor",
+	"Tactical Classic" = "epic_armor_classic",
+	"Press" = "press_armor",
+	"HECU" = "hecu_armor",
+	"Bloody" = "bloody_armor"
+	)
 
 /obj/item/clothing/suit/armor/hos
 	name = "armored greatcoat"

code/modules/clothing/suits/miscellaneous.dm

@@ -887,7 +887,7 @@
 
 /obj/item/clothing/head/hooded/winterhood/durathread
 	icon_state = "winterhood_durathread"
-	armor = list("melee" = 20, "bullet" = 8, "laser" = 15, "energy" = 8, "bomb" = 25, "bio" = 10, "rad" = 15, "fire" = 75, "acid" = 37, "wound" = 7)
+	armor = list("melee" = 15, "bullet" = 10, "laser" = 10,"energy" = 10, "bomb" = 20, "bio" = 15, "rad" = 10, "fire" = 5, "acid" = 50, "wound" = 15)
 
 /obj/item/clothing/suit/spookyghost
 	name = "spooky ghost"

code/modules/clothing/under/jobs/security.dm

@@ -56,6 +56,52 @@
 	desc = "A security jumpsuit designed with a special skytensive-polymerized-jogmesh(tm) for semi-maximum customization exactly once."
 	icon_state = "rsecurity"
 	item_state = "r_suit"
+	can_adjust = FALSE
+	unique_reskin_icons = list(
+	"Default" = 'icons/obj/clothing/uniforms.dmi',
+	"Tactical" = 'modular_skyrat/icons/obj/clothing/uniform.dmi',
+	"Sol Federation" = 'modular_skyrat/icons/obj/clothing/uniform.dmi',
+	"HECU" = 'modular_skyrat/icons/obj/clothing/uniform.dmi',
+	"Firestarter" = 'modular_skyrat/icons/obj/clothing/uniform.dmi',
+	"Gorka" = 'modular_skyrat/icons/obj/clothing/uniform.dmi',
+	"Bushfighter" = 'modular_skyrat/icons/obj/clothing/uniform.dmi',
+	)
+	unique_reskin_worn = list(
+	"Default" = 'icons/mob/clothing/uniform.dmi',
+	"Tactical" = 'modular_skyrat/icons/mob/clothing/uniform.dmi',
+	"Sol Federation" = 'modular_skyrat/icons/mob/clothing/uniform.dmi',
+	"HECU" = 'modular_skyrat/icons/mob/clothing/uniform.dmi',
+	"Firestarter" = 'modular_skyrat/icons/mob/clothing/uniform.dmi',
+	"Gorka" = 'modular_skyrat/icons/mob/clothing/uniform.dmi',
+	"Bushfighter" = 'modular_skyrat/icons/mob/clothing/uniform.dmi',
+	)
+	unique_reskin_worn_anthro = list(
+	"Default" = 'icons/mob/clothing/uniform_digi.dmi',
+	"Tactical" = 'modular_skyrat/icons/mob/clothing/uniform_digi.dmi',
+	"Sol Federation" = 'modular_skyrat/icons/mob/clothing/uniform_digi.dmi',
+	"HECU" = 'modular_skyrat/icons/mob/clothing/uniform_digi.dmi',
+	"Firestarter" = 'modular_skyrat/icons/mob/clothing/uniform_digi.dmi',
+	"Gorka" = 'modular_skyrat/icons/mob/clothing/uniform_digi.dmi',
+	"Bushfighter" = 'modular_skyrat/icons/mob/clothing/uniform_digi.dmi',
+	)
+	unique_reskin = list(
+	"Default" = "rsecurity",
+	"Tactical" = "tactical_uniform",
+	"Sol Federation" = "solfed_uniform",
+	"HECU" = "hecu_uniform",
+	"Firestarter" = "firestarter_uniform",
+	"Gorka" = "gorka_uniform",
+	"Bushfighter" = "rhodebrush",
+	)
+	unique_desc = list(
+	"Default" = "A good classic - tactical red jumpsuit for officers complete with Nanotrasen belt buckle.",
+	"Tactical" = "A tactical black jumpsuit with Nanotrasen's security armband.",
+	"Sol Federation" = "A tactical light-blue jumpsuit complete with kneepads and an insignia of Sol Federation.",
+	"HECU" = "A snow-camofluaged t-shirt and pants, perfect fit for hunting down the free man.",
+	"Firestarter" = "A tactical jumpsuit with some rusty colors.",
+	"Gorka" = "A militaristic jumpsuit coming from Russian colonies, perfect for windy mountains and space alike.",
+	"Bushfighter" = "A button-up shirt and cargo shorts in a very peculiar brush pattern, best worn with boots and webbing. What a time it was.",
+	)
 
 /*
  * Warden

code/modules/food_and_drinks/food/snacks/meat.dm

@@ -179,7 +179,6 @@
 	filling_color = "#000000"
 	tastes = list("metal" = 1)
 //
-
 /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/avian
 	desc = "Tastes like chicken, that's because it is!"
 	icon_state = "birdmeat"

code/modules/holiday/holidays.dm

@@ -478,15 +478,6 @@
 	begin_month = JUNE
 	begin_weekday = SUNDAY
 
-/datum/holiday/pride
-	name = PRIDE_MONTH
-	begin_day = 1
-	begin_month = JUNE
-	end_day = 30
-
-/datum/holiday/pride/getStationPrefix()
-	return pick("Pride", "Gay", "Bi", "Trans", "Lesbian", "Ace", "Aro", "Agender", pick("Enby", "Enbie"), "Pan", "Intersex", "Demi", "Poly", "Closeted", "Genderfluid")
-
 /datum/holiday/stonewall
 	name = "Stonewall Riots Anniversary"
 	begin_day = 28

code/modules/jobs/job_types/assistant.dm

@@ -36,8 +36,3 @@ Assistant
 	var/suited = !preference_source || preference_source.prefs.jumpsuit_style == PREF_SUIT
 	if (CONFIG_GET(flag/grey_assistants))
 		uniform = suited ? /obj/item/clothing/under/color/grey : /obj/item/clothing/under/color/jumpskirt/grey
-	else
-		if(SSevents.holidays && SSevents.holidays[PRIDE_MONTH])
-			uniform = suited ? /obj/item/clothing/under/color/rainbow : /obj/item/clothing/under/color/jumpskirt/rainbow
-		else
-			uniform = suited ? /obj/item/clothing/under/color/random : /obj/item/clothing/under/color/jumpskirt/random

code/modules/language/language_holder.dm

@@ -324,7 +324,6 @@ Key procs
 								/datum/language/dwarf = list(LANGUAGE_ATOM),
 								// LUMOS EDIT - MOAR LANGUAGES
 								/datum/language/vox = list(LANGUAGE_ATOM),
-								/datum/language/calcic = list(LANGUAGE_ATOM),
 								/datum/language/moffic = list(LANGUAGE_ATOM),
 								/datum/language/sylvan = list(LANGUAGE_ATOM),
 								/datum/language/shadowtongue = list(LANGUAGE_ATOM))
@@ -340,7 +339,6 @@ Key procs
 							/datum/language/dwarf = list(LANGUAGE_ATOM),
 							// LUMOS EDIT - MOAR LANGUAGES
 							/datum/language/vox = list(LANGUAGE_ATOM),
-							/datum/language/calcic = list(LANGUAGE_ATOM),
 							/datum/language/moffic = list(LANGUAGE_ATOM),
 							/datum/language/sylvan = list(LANGUAGE_ATOM),
 							/datum/language/shadowtongue = list(LANGUAGE_ATOM))

code/modules/mob/living/carbon/human/species_types/lizardpeople.dm

@@ -1,6 +1,6 @@
 /datum/species/lizard
 	// Reptilian humanoids with scaled skin and tails.
-	name = "Anthromorphic Lizard"
+	name = "Uthani"
 	id = "lizard"
 	say_mod = "hisses"
 	default_color = "00FF00"

code/modules/mob/living/carbon/human/species_types/plasmamen.dm

@@ -21,7 +21,7 @@
 	disliked_food = FRUIT
 	liked_food = VEGETABLES
 	outfit_important_for_life = /datum/outfit/plasmaman
-	languagewhitelist = list("Calcic") //Skyrat change - species language whitelist
+	languagewhitelist = list("Sol Common") //Skyrat change - species language whitelist
 
 /datum/species/plasmaman/spec_life(mob/living/carbon/human/H)
 	var/datum/gas_mixture/environment = H.loc.return_air()