Moving PRs #200 and #221 things to modular_nostra

code/datums/ruins/lavaland.dm

@@ -299,11 +299,3 @@
 	suffix = "lavaland_surface_elephant_graveyard.dmm"
 	allow_duplicates = FALSE
 	cost = 10
-
-/datum/map_template/ruin/lavaland/lavaland_errorcodehostile
-	name = "errorcode-hostile"
-	id = "errorcodehostile"
-	description = "Signal Lost- Error... Code-Hostile"
-	suffix = "lavaland_errorcodehostile.dmm"
-	allow_duplicates = FALSE
-	cost = 10

code/datums/ruins/space.dm

@@ -331,48 +331,6 @@
 	name = "Space Diner"
 	description = "Come, traveler of the bluespace planes. Sit, enjoy a drink and take one of the fair maidens for a night. The exit is the way you came in, via that teleporter thingy, but do remember to stay safe."
 
-/datum/map_template/ruin/space/syndie_minibase_spawn
-	id = "syndie_minibase_spawn"
-	suffix = "syndie_minibase_spawn.dmm"
-	name = "Syndicate Communications and Retrieval Base"
-	description = "The Syndicate have placed you within close proximity of your target, gather what information you can about the base. Get in, steal the Captains Antique Raygun and get out. May best of luck be on your side soldier."
-
-/datum/map_template/ruin/space/dcshuttle
-	id = "dcshuttle"
-	suffix = "dcshuttle.dmm"
-	name = "DefCorp Ship"
-	description = "Jer"
-
-/datum/map_template/ruin/space/spiderden
-	id = "spiderden"
-	suffix = "spiderden.dmm"
-	name = "Spider Den"
-	description = "They tell stories of the crucades that happened millenias past..."
-
-/datum/map_template/ruin/space/dcderelict
-	id = "dcderelict"
-	suffix = "dcderelict.dmm"
-	name = "DC Derelict"
-	description = "A satellite for the mysterious corporation known as DefCorp, appears to be a bit dated."
-
-/datum/map_template/ruin/space/spacepolice
-	id = "spacepolice"
-	suffix = "spacepolice.dmm"
-	name = "Space Police"
-	description = "Hired by CentCom to keep you safe!"
-
-/datum/map_template/ruin/space/madxenobiologist
-	id = "madxenobiologist"
-	suffix = "madxenobiologist.dmm"
-	name = "Xenobiology Prototype Ship"
-	description = "I will get my revenge..."
-
-/datum/map_template/ruin/space/ultimatespacegamer
-	id = "ultimatespacegamer"
-	suffix = "ultimatespacegamer.dmm"
-	name = "gamerdome"
-	description = "Who will come ontop!?"
-	allow_duplicates = TRUE
 /datum/map_template/ruin/space/suspicious
 	id = "helterskelter"
 	suffix = "skelter.dmm"

code/game/objects/items/weaponry.dm

@@ -86,35 +86,6 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 	force = 25
 	block_chance = 0
 
-/obj/item/claymore/unforgiven
-	name = "the unforgiven"
-	desc = "You feel betrayed, broken. Have they forgiven you? Will they forgive you!? Your mind spins with anger and confusion..."
-	hitsound = 'sound/weapons/sear.ogg'
-	force = 35
-	throwforce = 15
-	slot_flags = ITEM_SLOT_BACK
-	attack_verb = list("scorned", "carved", "seared", "sliced", "gashed", "glaved", "gutted")
-	block_chance = 30
-	max_integrity = 500
-	item_flags = SLOWS_WHILE_IN_HAND
-
-/obj/item/claymore/unforgiven/Initialize(mapload)
-	. = ..()
-	START_PROCESSING(SSobj, src)
-	AddComponent(/datum/component/butchering, 50, 105)
-
-/obj/item/claymore/unforgiven/Destroy()
-	STOP_PROCESSING(SSobj, src)
-	. = ..()
-
-/obj/item/claymore/unforgiven/process()
-	slowdown = -0.2
-	if(iscarbon(loc))
-		var/mob/living/carbon/wielder = loc
-		if(wielder.is_holding(src))
-			wielder.update_equipment_speed_mods()
-
-
 /obj/item/claymore/highlander //ALL COMMENTS MADE REGARDING THIS SWORD MUST BE MADE IN ALL CAPS
 	desc = "<b><i>THERE CAN BE ONLY ONE, AND IT WILL BE YOU!!!</i></b>\nActivate it in your hand to point to the nearest victim."
 	flags_1 = CONDUCT_1

code/game/objects/structures/ghost_role_spawners.dm

@@ -380,135 +380,6 @@
 	new/obj/structure/fluff/empty_sleeper/syndicate(get_turf(src))
 	return ..()
 
-// Start of Nostra change
-/obj/effect/mob_spawn/human/spacepolice
-	name = "space policeman"
-	desc = "A sleeper designed for long-term stasis."
-	mob_name = "centcom policeman"
-	job_description = "Space Policeman"
-	icon = 'icons/obj/machines/sleeper.dmi'
-	icon_state = "sleeper"
-	objectives = list("Track down any Syndicate, Wizard Federation or Eldritch Worshippers and eliminate them, but under any circumstances are you to harm any loyal Employees of Nanotrasen.") //Nostra change - changed into list
-	death = FALSE
-	roundstart = FALSE
-	random = TRUE
-	id_job = "Policeman"
-	id_access = "assistant"
-	outfit = /datum/outfit/spacepoliceman
-	short_desc = "You are an undercover agent assigned by Spearhead Industries tasked with tracking down any Syndicate or Station Threatening Anomalies."
-	flavour_text = "You are an agent assigned by Spearhead Industries and tasked with rooting out and eliminating those classified enemies of Central Command such as the Syndicate, Wizard Federation, or worshipers of the Elder Gods Nar'sie and Ratvar. With hopes that our kind deeds to enforce Space Law beyond the borders of Sol will allow us, Spearhead Industries to gain a foot-hold in Nanotrasens Military Operations."
-	important_info = "DO NOT HARM ANY LOYAL NANOTRASEN CREW, OR THOSE IN COMMAND HAVE FULL RIGHT FOR YOUR EXTERMINATION"
-	assignedrole = "Space Policeman"
-// End of Nostra change
-
-/datum/outfit/spacepoliceman
-	name = "Space Policeman"
-	uniform = /obj/item/clothing/under/rank/security/officer/spacepol
-	shoes = /obj/item/clothing/shoes/jackboots
-	mask = /obj/item/clothing/mask/gas/sechailer/swat/spacepol
-	head = /obj/item/clothing/head/helmet/police
-	ears = /obj/item/radio/headset
-	glasses = /obj/item/clothing/glasses/hud/security/sunglasses
-	back = /obj/item/tank/internals/oxygen
-	belt = /obj/item/gun/energy/e_gun/mini
-	suit = /obj/item/clothing/suit/armor/vest/blueshirt
-	suit_store = /obj/item/gun/energy/e_gun
-	gloves = /obj/item/clothing/gloves/tackler/combat
-	id = /obj/item/card/id
-	l_pocket = /obj/item/assembly/flash
-	r_pocket = /obj/item/restraints/handcuffs
-	implants = list(/obj/item/implant/mindshield)
-
-/obj/effect/mob_spawn/human/spacepolice/Destroy()
-	new/obj/structure/fluff/empty_sleeper/nanotrasen(get_turf(src))
-	return ..()
-
-/obj/effect/mob_spawn/human/spacepolice/special(mob/living/carbon/human/new_spawn)
-	ADD_TRAIT(new_spawn,TRAIT_NOCLONE,GHOSTROLE_TRAIT)
-	ADD_TRAIT(new_spawn,TRAIT_NO_TELEPORT,GHOSTROLE_TRAIT)
-	ADD_TRAIT(new_spawn,TRAIT_RESISTLOWPRESSURE,GHOSTROLE_TRAIT)
-	ADD_TRAIT(new_spawn,TRAIT_RESISTCOLD,GHOSTROLE_TRAIT)
-
-//Mad Xenobiologist
-/obj/effect/mob_spawn/human/madxenobiologist
-	name = "mad xenobiologist"
-	desc = "A sleeper designed for long-term stasis."
-	mob_name = "mad xenobio"
-	job_description = "Mad Xenobiologist"
-	icon = 'icons/obj/machines/sleeper.dmi'
-	icon_state = "sleeper"
-	//objectives = "" // Nostra change
-	death = FALSE
-	roundstart = FALSE
-	random = TRUE
-	id_job = "Scientist"
-	id_access = "scientist"
-	outfit = /datum/outfit/madxeno
-	short_desc = "You are the Mad Xenobiologist."
-	flavour_text = "You were a former Nanotrasen employee but due to your insane admiration for your slimes, and recent negotiations with the Animal Rights Consortium, betrayed Nanotrasen. Attempting to flee on a stolen Xenobiology Specialized Prototype Ship, but during your haste your ship's right rear thruster was barely struck by Bluespace Artillery, almost killing you. But by sheer chance you had stolen a single Metal Foam Grenade during your escape, saving you... for now."
-	important_info = ""
-	assignedrole = "Mad Xenobiologist"
-	var/themadspecies // Nostra change
-
-/datum/outfit/madxeno
-	name = "Mad Xenobiologist"
-	uniform = /obj/item/clothing/under/rank/rnd/scientist
-	shoes = /obj/item/clothing/shoes/sneakers/white
-	head = /obj/item/clothing/head/soft/purple
-	back = /obj/item/storage/backpack/satchel/tox
-	suit = /obj/item/clothing/suit/toggle/labcoat
-	id = /obj/item/card/id
-
-/obj/effect/mob_spawn/human/madxenobiologist/Destroy()
-	new/obj/structure/fluff/empty_sleeper(get_turf(src))
-	return ..()
-
-/obj/effect/mob_spawn/human/madxenobiologist/special(mob/living/carbon/human/new_spawn)
-	ADD_TRAIT(new_spawn,TRAIT_UNSTABLE,GHOSTROLE_TRAIT)
-	to_chat(new_spawn, "<span class='warning'>Objective 1:</span> Get sustainable power to your ship and survive using slimes.")
-	to_chat(new_spawn, "<span class='warning'>Objective 2:</span> Spread slimes wherever you can.")
-	to_chat(new_spawn, "<span class='warning'>Objective 3:</span> Take revenge upon Nanotrasen, transform them all into [themadspecies] in the name of the ARC and the lack of my sanity! HAHAHAHAHAHAHA!") // Nostra change
-
-// Ultimate Space Gamer
-/obj/effect/mob_spawn/human/ultimatespacegamer
-	name = "ultimate gamer"
-	desc = "A sleeper designed for long-term stasis."
-	mob_name = "space gamer ultimate"
-	job_description = "Ultimate Space Gamer"
-	icon = 'icons/obj/machines/sleeper.dmi'
-	icon_state = "sleeper"
-	objectives = list("Be the best there ever was, and kill whoever threatens you superiority within the realm of VR.") //Nostra change - changed into list
-	death = FALSE
-	roundstart = FALSE
-	random = TRUE
-	id_job = "Gamer"
-	mob_species = /datum/species/human
-	outfit = /datum/outfit/gamergear
-	short_desc = "You are the ULTIMATE SPACE GAMER."
-	flavour_text = "From the start you were a failure, doomed for nothing but a life of sadness and sorrow. But with new found inspiration found with Donk Corporations and a lifetime supply of Donk Pockets on the line, you knew you were destined for something greater, something.... out of this world, or perhaps..... in another?"
-	important_info = ""
-	assignedrole = "Ultimate Space Gamer"
-
-/datum/outfit/gamergear
-	name = "Ultimate Space Gamer"
-	uniform = /obj/item/clothing/under/costume/swagoutfit
-	shoes = /obj/item/clothing/shoes/swagshoes
-	id = /obj/item/card/id/gold
-
-/obj/effect/mob_spawn/human/ultimatespacegamer/Destroy()
-	return ..()
-
-/obj/effect/mob_spawn/human/ultimatespacegamer/special(mob/living/new_spawn)
-	var/gamername = pick("xX_RobustClown_Xx","Ninja","Up-Dog","Wohn Jick","Engineer Gaming","icewallowcome","j0e","Xx_ghostasaur_xX", "Donk Co.")
-	//new_spawn.real_name = gamername //why this works when moving it from one function to another is beyond me
-	var/mob/living/carbon/human/H = new_spawn
-	var/obj/item/worn = H.wear_id
-	var/obj/item/card/id/id = worn.GetID()
-	id.registered_name = gamername
-	id.update_label()
-	to_chat(new_spawn, "Your goal? Be the best there ever was, beat the VR sleeper game and show your dominance as the ultimate gamer. Plus Donk Co. promised a life time supply of Donk Pockets, be it I kill any NT Employees divulging themselves in the VR world.")
-
-
 //Space Hotel Staff
 /obj/effect/mob_spawn/human/hotel_staff //not free antag u little shits
 	name = "staff sleeper"
@@ -618,40 +489,6 @@
 	implants = list(/obj/item/implant/mindshield) //No revolutionaries, he's MY friend.
 	id = /obj/item/card/id
 
-// Start of Nostra change
-/obj/effect/mob_spawn/human/syndicate_agent_base_comms
-	name = "Syndicate Telecommunications Agent"
-	roundstart = FALSE
-	death = FALSE
-	icon = 'icons/obj/machines/sleeper.dmi'
-	icon_state = "sleeper_s"
-	outfit = /datum/outfit/syndicate_empty
-	assignedrole = "Syndicate Telecommunications Agent"
-	short_desc = "You are a Syndicate Telecommunications Agent"
-	flavour_text = "You have been assigned by MI13 in gathering intel about NT's latest technological breakthrough in Xeno-technology. Those slimes are more then Central Commmand is willing to give credit for, and this will bring their end too NT. Ensure no NT thugs come aboard your vessel at all costs."
-	important_info = "Do NOT kill the station crew unless your base has been discovered and breached by them."
-	objectives = "Gather as much intel about NT's Slime Operations as you can, ensure you and your fellow agent stay undetected."
-// End of Nostra change
-
-/obj/effect/mob_spawn/human/syndicate_agent_base_infl
-	name = "Syndicate Infiltration Agent"
-	roundstart = FALSE
-	death = FALSE
-	icon = 'icons/obj/machines/sleeper.dmi'
-	icon_state = "sleeper_s"
-	outfit = /datum/outfit/syndicate_empty
-	assignedrole = "Syndicate Infiltration Agent"
-	short_desc = "You are a Syndicate Infiltration Agent"
-	flavour_text = "You have been assigned by Waffle Co. in infiltrating and retrieving the next generation of weapon development technology. Assure no NT scumbags acknowledge your presence and escape with the valuables in hand. Do not fail us."
-	important_info = "Do NOT kill the station crew unless your base has been discovered and breached by them."
-	objectives = list("Steal the Captains Antique Lasergun, ensure your presence stays undetected.") //Nostra change - changed into list
-
-/obj/effect/mob_spawn/human/syndicate_agent_base_comms/Destroy()
-	return ..()
-
-/obj/effect/mob_spawn/human/syndicate_agent_base_comms/special(mob/living/carbon/human/new_spawn)
-	to_chat(new_spawn, "<span class='warning'>Objectives:</span> Gather as much intel about NT's Slime Operations as you can, ensure you and your fellow agent stay undetected.")
-
 /obj/effect/mob_spawn/human/syndicate_agent_base_infl/Destroy()
 	return ..()
 

code/modules/clothing/outfits/standard.dm

@@ -267,23 +267,6 @@
 	head = /obj/item/clothing/head/culthood/alt/ghost
 	r_hand = /obj/item/melee/cultblade/ghost
 
-/datum/outfit/dead_cultist
-	name = "Dead Cultist"
-
-	suit = /obj/item/clothing/suit/cultrobes
-	shoes = /obj/item/clothing/shoes/cult
-	head = /obj/item/clothing/head/culthood
-
-/datum/outfit/eskimo
-	name = "Eskimo"
-
-	uniform = /obj/item/clothing/under/color/black
-	suit = /obj/item/clothing/suit/hooded/wintercoat
-	shoes = /obj/item/clothing/shoes/winterboots
-	head = /obj/item/clothing/head/hooded/winterhood
-	r_hand = /obj/item/spear
-
-
 /datum/outfit/wizard
 	name = "Blue Wizard"
 

code/modules/vehicles/speedbike.dm

@@ -36,32 +36,6 @@
 	icon_state = "speedbike_red"
 	overlay_state = "cover_red"
 
-//The Law
-/obj/vehicle/ridden/space/thelawspeedbike
-	name = "The Law"
-	icon = 'icons/obj/bike.dmi'
-	icon_state = "speedbike_blue"
-	layer = LYING_MOB_LAYER
-	var/overlay_state = "cover_blue"
-	var/mutable_appearance/overlay
-
-/obj/vehicle/ridden/space/thelawspeedbike/Initialize()
-	. = ..()
-	overlay = mutable_appearance(icon, overlay_state, ABOVE_MOB_LAYER)
-	add_overlay(overlay)
-	var/datum/component/riding/D = LoadComponent(/datum/component/riding)
-	D.set_riding_offsets(RIDING_OFFSET_ALL, list(TEXT_NORTH = list(0, -8), TEXT_SOUTH = list(0, 4), TEXT_EAST = list(-10, 5), TEXT_WEST = list( 10, 5)))
-	D.vehicle_move_delay = 2
-	D.set_vehicle_dir_offsets(NORTH, -16, -16)
-	D.set_vehicle_dir_offsets(SOUTH, -16, -16)
-	D.set_vehicle_dir_offsets(EAST, -18, 0)
-	D.set_vehicle_dir_offsets(WEST, -18, 0)
-
-/obj/vehicle/ridden/space/thelawspeedbike/Move(newloc,move_dir)
-	if(has_buckled_mobs())
-		new /obj/effect/temp_visual/dir_setting/speedbike_trail(loc,move_dir)
-	. = ..()
-
 //BM SPEEDWAGON
 
 /obj/vehicle/ridden/space/speedwagon

modular_nostra/code/__HELPERS/cmp.dm

@@ -0,0 +1,2 @@
+/proc/cmp_typepaths_dsc(A, B)
+	return sorttext("[A]","[B]")

modular_nostra/code/datums/ruins/lavaland.dm

@@ -0,0 +1,7 @@
+/datum/map_template/ruin/lavaland/lavaland_errorcodehostile
+	name = "errorcode-hostile"
+	id = "errorcodehostile"
+	description = "Signal Lost- Error... Code-Hostile"
+	suffix = "lavaland_errorcodehostile.dmm"
+	allow_duplicates = FALSE
+	cost = 10

modular_nostra/code/datums/ruins/space.dm

@@ -0,0 +1,48 @@
+/datum/map_template/ruin/space/syndie_minibase_spawn
+	id = "syndie_minibase_spawn"
+	suffix = "syndie_minibase_spawn.dmm"
+	name = "Syndicate Communications and Retrieval Base"
+	description = "The Syndicate have placed you within close proximity of your target, gather what information you can about the base. Get in, steal the Captains Antique Raygun and get out. May best of luck be on your side soldier."
+
+/datum/map_template/ruin/space/dcshuttle
+	id = "dcshuttle"
+	suffix = "dcshuttle.dmm"
+	name = "DefCorp Ship"
+	description = "Jer"
+
+/datum/map_template/ruin/space/spiderden
+	id = "spiderden"
+	suffix = "spiderden.dmm"
+	name = "Spider Den"
+	description = "They tell stories of the crucades that happened millenias past..."
+
+/datum/map_template/ruin/space/dcderelict
+	id = "dcderelict"
+	suffix = "dcderelict.dmm"
+	name = "DC Derelict"
+	description = "A satellite for the mysterious corporation known as DefCorp, appears to be a bit dated."
+
+/datum/map_template/ruin/space/spacepolice
+	id = "spacepolice"
+	suffix = "spacepolice.dmm"
+	name = "Space Police"
+	description = "Hired by CentCom to keep you safe!"
+
+/datum/map_template/ruin/space/madxenobiologist
+	id = "madxenobiologist"
+	suffix = "madxenobiologist.dmm"
+	name = "Xenobiology Prototype Ship"
+	description = "I will get my revenge..."
+
+/datum/map_template/ruin/space/ultimatespacegamer
+	id = "ultimatespacegamer"
+	suffix = "ultimatespacegamer.dmm"
+	name = "gamerdome"
+	description = "Who will come ontop!?"
+	allow_duplicates = TRUE
+
+/datum/map_template/ruin/spacenearstation/roid11
+	id = "roid11"
+	suffix = "roid11.dmm"
+	name = "Snow Roid"
+	description = "Mineral asteroid. Ft. Snow Biome with mysterious tree."