Merge branch 'master' of https://github.com/sheepishgoat/GS13-Citadel into tweaks-and-fixes

This reverts commit 050dcb5cc1.

GainStation13/code/__HELPERS/global_lists.dm

@@ -0,0 +1 @@
+GLOBAL_LIST_INIT(genital_fluids_list, list("Milk", "Water", "Semen", "Femcum", "Honey", "Strawberry Milk", "Nutriment", "Berry Juice"))

GainStation13/code/datums/traits.dm

@@ -19,6 +19,15 @@
 	value = -1
 	medical_record_text = "Patient's legs seem to lack strength"
 
+/datum/quirk/strong_legs //GS13
+	name = "Strong Legs"
+	desc = "Your body is able to handle heavier sizes very well."
+	value = 2
+	mob_trait = TRAIT_STRONGLEGS
+	gain_text = "<span class='notice'>You feel like you can carry more weight.</span>"
+	lose_text = "<span class='notice'>Your legs cannot bear heavier loads anymore.</span>"
+	medical_record_text = "Patient exhibits increased muscle strength in their legs."
+
 /datum/quirk/draconicspeaker
 	name = "Draconic speaker"
 	desc = "Due to your time spent around lizards, you can speak Draconic!"
@@ -48,3 +57,20 @@
 /datum/quirk/slimespeaker/remove()
 	var/mob/living/M = quirk_holder
 	M?.remove_language(/datum/language/slime)
+
+/datum/quirk/SpawnWithWheelchair
+	name = "Mobility Assistance"
+	desc = "After your last failed fitness test, you were advised to start using a hoverchair"
+
+/datum/quirk/SpawnWithWheelchair/on_spawn()
+	if(quirk_holder.buckled) // Handle late joins being buckled to arrival shuttle chairs.
+		quirk_holder.buckled.unbuckle_mob(quirk_holder)
+
+	var/turf/T = get_turf(quirk_holder)
+	var/obj/structure/chair/spawn_chair = locate() in T
+
+	var/obj/vehicle/ridden/wheelchair/wheels = new(T)
+	if(spawn_chair) // Makes spawning on the arrivals shuttle more consistent looking
+		wheels.setDir(spawn_chair.dir)
+
+	wheels.buckle_mob(quirk_holder)

GainStation13/code/game/objects/items/RCD.dm

@@ -3,7 +3,7 @@
 	desc = "A tool that can construct and deconstruct walls, airlocks and floors on the fly. This model works at a distance."
 	id = "arcd_design"
 	build_type = PROTOLATHE
-	materials = list(/datum/material/iron = MINERAL_MATERIAL_AMOUNT, /datum/material/glass = MINERAL_MATERIAL_AMOUNT, /datum/material/diamond = 500, MAT_BLUESPACE = 500)  // costs more than what it did in the autolathe, this one comes loaded.
+	materials = list(/datum/material/iron = MINERAL_MATERIAL_AMOUNT, /datum/material/glass = MINERAL_MATERIAL_AMOUNT, /datum/material/diamond = 500, /datum/material/bluespace = 500)  // costs more than what it did in the autolathe, this one comes loaded.
 	build_path = /obj/item/construction/rcd/arcd
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
@@ -41,6 +41,6 @@
 	id = "borg_arcd"
 	build_type = MECHFAB
 	build_path = /obj/item/borg/upgrade/arcd
-	materials = list(/datum/material/iron = MINERAL_MATERIAL_AMOUNT, /datum/material/glass = MINERAL_MATERIAL_AMOUNT, /datum/material/diamond = 500, MAT_BLUESPACE = 500)
+	materials = list(/datum/material/iron = MINERAL_MATERIAL_AMOUNT, /datum/material/glass = MINERAL_MATERIAL_AMOUNT, /datum/material/diamond = 500, /datum/material/bluespace = 500)
 	construction_time = 100
 	category = list("Cyborg Upgrade Modules")

GainStation13/code/game/plushes.dm

@@ -2,7 +2,7 @@
 		icon = 'icons/obj/plushes.dmi'
 
 /obj/item/toy/plush/gs13/metha
-	name = "Magical Captain plush/gs13ie"
+	name = "Magical Captain plushie"
 	desc = "A NEW GATO TOY FROM GATO CORPORATION, FEEL THE MAGIC OF THIS COOL TOY!"
 	icon_state = "metha"
 	attack_verb = list("fattened","Metha'd", "Brigged")
@@ -45,24 +45,29 @@
 	squeak_override = list('modular_citadel/sound/voice/weh.ogg' = 1)
 
 /obj/item/toy/plush/gs13/kinichi
-	desc = "A silly looking plush/gs13ie of an adorable lizard janitor. His smile is heartwarming to look at."
+	desc = "A silly looking plushie of an adorable lizard janitor. His smile is heartwarming to look at."
 	icon_state = "kinichi"
 	attack_verb = list("hissed","squished", "hugged")
 
 /obj/item/toy/plush/gs13/lgo
-	desc = "An attempt to market one of cleaning machines from the local market, in the form of a purchasable plush/gs13ie."
+	desc = "An attempt to market one of cleaning machines from the local market, in the form of a purchasable plushie."
 	icon_state = "lgo"
 	attack_verb = list("gronkled","beeped", "brushed")
 
 /obj/item/toy/plush/gs13/oliver
-	desc = "A plush/gs13 of a silly shark with a stylish bandanna."
+	desc = "A plush of a silly shark with a stylish bandanna."
 	icon_state = "oliver"
 	attack_verb = list("chomped", "bit")
 
 /obj/item/toy/plush/gs13/chloe
-	desc = "A plush/gs13 of a chunky red-haired botanist."
+	desc = "A plush of a chunky red-haired botanist."
 	icon_state = "chloe"
 	attack_verb = list("squished", "hugged", "smushed")
 
 /obj/item/toy/plush/gs13/mammal/fox
 	icon_state = "fox"
+
+/obj/item/toy/plush/gs13/delta
+	desc = "A plush of a chunky greaseball."
+	icon_state = "delta"
+	attack_verb = list("squished", "hugged", "smushed")

GainStation13/code/game/turfs/closed.dm

@@ -16,12 +16,12 @@
 /turf/closed/indestructible/candy
 	name = "Candy wall"
 	desc = "Despite being made out of mere candy, this wall is harder than stone!"
-	icon = 'Gainstation13/icons/turf/wall_candy.dmi'
+	icon = 'Gainstation13/icons/turf/walls/wall_candy.dmi'
 	icon_state = "candywall"
 
 
 /turf/closed/indestructible/chocolate
 	name = "Chocolate wall"
 	desc = "Somehow, it doesn't melt at all..."
-	icon = 'Gainstation13/icons/turf/wall_candy.dmi'
+	icon = 'Gainstation13/icons/turf/walls/wall_candy.dmi'
 	icon_state = "choco_wall1"

GainStation13/code/mechanics/den abductors/console.dm

@@ -26,7 +26,7 @@
 
 	var/credits = linked_scale?.credits
 	dat += "Gear Credits: [credits] <br>"
-	dat += "<b>Transfer credits in exchange for supplies:</b><br>"	
+	dat += "<b>Transfer credits in exchange for supplies:</b><br>"
 	for(var/goodie in subtypesof(/datum/feeders_den_goodie))
 		var/datum/feeders_den_goodie/temp_goodie = new goodie()
 		dat += "<a href='?src=[REF(src)];dispense=[goodie]'>[temp_goodie.name] (Cost: [temp_goodie.credit_cost])</A><br>"
@@ -64,7 +64,7 @@
 			say("Unable to purchase more!")
 			return FALSE
 
-		if(!Dispense(item_path, price))	
+		if(!Dispense(item_path, price))
 			return FALSE
 
 		if(buy_counts[goodie_datum.name] == null)
@@ -146,7 +146,7 @@
 		return TRUE
 
 	return ..()
-	
+
 /obj/structure/scale/credits
 	name = "tracking scale"
 	desc = "A upgraded scale that tracks to weight of all of those that have stepped on it. Using this will add credits to the feeder console"
@@ -155,7 +155,7 @@
 	/// How much credits do we currently have?
 	var/credits = 0
 	/// How many credits are we going to reward per pound gained?
-	var/credits_per_fatness = 0.25 
+	var/credits_per_fatness = 0.25
 	/// A list containing all of the people we've scanned and their maximum weight.
 	var/list/scanned_people = list()
 	/// What is the current team number?
@@ -201,7 +201,7 @@
 	var/credit_total = max((credits_to_add - credits_to_remove), 0)
 	if(credit_total > 0)
 		say("[credit_total] credits have been deposited into the console.")
-	
+
 	credits += credit_total
 	scanned_people[fatty] += credit_total
 
@@ -214,6 +214,7 @@
 	team_number = 27
 	vest_mode_action = null
 	vest_disguise_action = null
+	check_if_abductor = FALSE
 
 /obj/machinery/computer/camera_advanced/abductor/feeder/IsScientist(mob/living/carbon/human/H)
 	return TRUE
@@ -245,4 +246,4 @@
 
 	prepare(target,user)
 	return TRUE
-	
+

GainStation13/code/mechanics/fatrousal.dm

@@ -16,14 +16,14 @@
 		var/mob/living/carbon/C = quirk_holder
 		C.hider_remove(src)
 
-/*
+
 /datum/quirk/fatrousal/proc/fat_hide(var/mob/living/carbon/user)
 	if(iscarbon(quirk_holder))
 		var/mob/living/carbon/C = quirk_holder
-		return C.getArousalLoss()*35
+		return C.getArousal()*35
 
 	return FALSE
-*/
+
 
 ///mob/living/adjust_arousal(amount, updating_arousal=1)
 //	if(HAS_TRAIT(src, TRAIT_FATROUSAL))

GainStation13/code/mechanics/recipes.dm

@@ -2,4 +2,14 @@
 	name = "Calorite dance floor"
 	result = /obj/item/stack/tile/mineral/calorite/dance
 	reqs = list(/obj/item/stack/cable_coil = 3, /obj/item/stack/tile/mineral/calorite = 1)
-	category = CAT_MISC
+	subcategory = CAT_MISCELLANEOUS
+	category = CAT_MISCELLANEOUS
+
+/datum/crafting_recipe/nutribot
+	name = "Nutribot"
+	reqs = list(/obj/item/stack/sheet/cardboard = 1,
+				/obj/item/stack/sheet/mineral/calorite = 1,
+				/obj/item/bodypart/r_arm/robot = 1,
+				/obj/item/assembly/prox_sensor = 1)
+	result = /mob/living/simple_animal/bot/nutribot
+	category = CAT_ROBOT

GainStation13/code/mobs/emote.dm

@@ -1,2 +1,45 @@
-/datum/emote/proc/get_sound(mob/living/user)
-	return sound //by default just return this var.
+/datum/emote/speen
+	key = "speen"
+	key_third_person = "speeeeens!"
+	restraint_check = TRUE
+	mob_type_allowed_typecache = list(/mob/living, /mob/dead/observer)
+	mob_type_ignore_stat_typecache = list(/mob/dead/observer)
+
+/datum/emote/speen/run_emote(mob/user)
+	. = ..()
+	if(.)
+		user.spin(20, 1)
+
+		if(iscyborg(user) && user.has_buckled_mobs())
+			var/mob/living/silicon/robot/R = user
+			var/datum/component/riding/riding_datum = R.GetComponent(/datum/component/riding)
+			if(riding_datum)
+				for(var/mob/M in R.buckled_mobs)
+					riding_datum.force_dismount(M)
+			else
+				R.unbuckle_all_mobs()
+
+/datum/emote/speen/run_emote(mob/living/user, params)
+	if(ishuman(user))
+		if(user.nextsoundemote >= world.time)
+			return
+		user.nextsoundemote = world.time + 7
+		playsound(user, 'GainStation13/sound/voice/speen.ogg', 50, 1, -1)
+	. = ..()
+
+
+/datum/emote/living/cackle
+	key = "cackle"
+	key_third_person = "cackles"
+	message = "cackles hysterically!"
+	emote_type = EMOTE_AUDIBLE
+	muzzle_ignore = FALSE
+	restraint_check = FALSE
+
+/datum/emote/living/cackle/run_emote(mob/living/user, params)
+	if(ishuman(user))
+		if(user.nextsoundemote >= world.time)
+			return
+		user.nextsoundemote = world.time + 7
+		playsound(user, 'GainStation13/sound/voice//cackle_yeen.ogg', 50, 1, -1)
+	. = ..()

GainStation13/code/modules/arousal/arousal.dm

@@ -0,0 +1,19 @@
+//GS13 Port
+/mob/living/proc/mob_climax(forced_climax = FALSE, cause = "none")//This is just so I can test this shit without being forced to add actual content to get rid of arousal. Will be a very basic proc for a while.
+	set name = "Masturbate"
+	set category = "IC"
+	if(canbearoused && !restrained() && !stat)
+		if(mb_cd_timer <= world.time)
+			//start the cooldown even if it fails
+			mb_cd_timer = world.time + mb_cd_length
+			if(getArousal() >= ((max_arousal / 100) * 33))//33% arousal or greater required
+				src.visible_message("<span class='danger'>[src] starts masturbating!</span>", \
+								"<span class='userdanger'>You start masturbating.</span>")
+				if(do_after(src, 30, target = src))
+					src.visible_message("<span class='danger'>[src] relieves [p_them()]self!</span>", \
+								"<span class='userdanger'>You have relieved yourself.</span>")
+					SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "orgasm", /datum/mood_event/orgasm)
+					setArousal(min_arousal)
+			else
+				to_chat(src, "<span class='notice'>You aren't aroused enough for that.</span>")
+

GainStation13/code/modules/loadout/backpack.dm

@@ -1,4 +1,4 @@
-/datum/gear/bluespace_belt
+/datum/gear/backpack/bluespace_belt
 	name = "Bluespace Belt"
 	category = LOADOUT_SUBCATEGORY_BACKPACK_GENERAL
 	path = /obj/item/bluespace_belt

GainStation13/code/modules/loadout/gloves.dm

@@ -1,11 +1,9 @@
-/datum/gear/syntech/ring
+/datum/gear/gloves/syntech/ring
 	name = "Normalizer Ring"
-	category = LOADOUT_CATEGORY_GLOVES
 	path = /obj/item/clothing/gloves/ring/syntech
 	cost = 6
 
-/datum/gear/syntech/band
+/datum/gear/gloves/syntech/band
 	name = "Normalizer Band"
-	category = LOADOUT_CATEGORY_GLOVES
 	path = /obj/item/clothing/gloves/ring/syntech/band
 	cost = 6

GainStation13/code/modules/loadout/neck.dm

@@ -1,17 +1,14 @@
-/datum/gear/syntech/pendant
+/datum/gear/neck/syntech/pendant
 	name = "Normalizer Pendant"
-	category = LOADOUT_CATEGORY_NECK
 	path = /obj/item/clothing/neck/syntech
 	cost = 6
 
-/datum/gear/syntech/choker
+/datum/gear/neck/syntech/choker
 	name = "Normalizer Choker"
-	category = LOADOUT_CATEGORY_NECK
 	path = /obj/item/clothing/neck/syntech/choker
 	cost = 6
 
-/datum/gear/syntech/collar
+/datum/gear/neck/syntech/collar
 	name = "Normalizer Collar"
-	category = LOADOUT_CATEGORY_NECK
 	path = /obj/item/clothing/neck/syntech/collar
 	cost = 6

GainStation13/code/modules/mapping/ghost_roles.dm

@@ -12,6 +12,7 @@
 	flavour_text = "After you've sold your soul to corporate overlords, your contract obliged you to enter cryostasis. \
 	Finally, after God knows how long, the cryopod system have awakened you with only a single sentence of information - welcome and lure in new guests into the freshly opened GATO restaurant!"
 	assignedrole = "Restaurant worker"
+	mirrorcanloadappearance = TRUE
 
 /obj/effect/mob_spawn/human/fastfoodmanager
 	name = "Corporate cryostasis pod"
@@ -27,6 +28,7 @@
 	flavour_text = "After you've sold your soul to corporate overlords, your contract obliged you to enter cryostasis. \
 	Finally, after God knows how long, the cryopod system have awakened you with only a single sentence of information - make sure to keep the best care of GATO's restaurant, currently under your management! You have a higher say over your workers, but do not abuse this power."
 	assignedrole = "Restaurant manager"
+	mirrorcanloadappearance = TRUE
 
 /obj/effect/mob_spawn/human/fastfood/Initialize(mapload)
 	. = ..()
@@ -108,6 +110,7 @@
 	death = FALSE
 	roundstart = FALSE
 	mob_species = /datum/species/human
+	mirrorcanloadappearance = TRUE
 
 /datum/outfit/feeders_den/fanatic
 	name = "Feeder Fanatic"
@@ -152,6 +155,7 @@
 	death = FALSE
 	roundstart = FALSE
 	mob_species = /datum/species/human
+	mirrorcanloadappearance = TRUE
 
 /datum/outfit/feeders_den/victim
 	name = "Den Victim"

GainStation13/code/modules/mob/living/belly.dm

@@ -14,6 +14,7 @@
 	var/inflatable			= FALSE //For inflation connoisseurs
 	var/size_cached			= 0
 	var/prev_size			= 0
+	layer_index = BELLY_LAYER_INDEX
 
 /obj/item/organ/genital/belly/modify_size(modifier, min = BELLY_SIZE_DEF, max = BELLY_SIZE_MAX)
 	var/new_value = clamp(size_cached + modifier, min, max)
@@ -42,8 +43,9 @@
 	if(D.species.use_skintones && D.features["genitals_use_skintone"])
 		color = SKINTONE2HEX(H.skin_tone)
 	else
-		color = "[D.features["belly_color"]]"
-	size = "[D.features["belly_size"]]"
+		color = "#[D.features["belly_color"]]"
+	size = D.features["belly_size"]
+	inflatable = D.features["inflatable_belly"]
 	toggle_visibility(D.features["belly_visibility"], FALSE)
 
 

GainStation13/code/modules/reagents/chemistry/recipes/fatchem.dm

@@ -5,7 +5,7 @@
 	name = "lipoifier"
 	id = /datum/reagent/consumable/lipoifier
 	results = list(/datum/reagent/consumable/lipoifier = 3)
-	required_reagents = list(/datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/cornoil = 1, /datum/reagent/medicine/synthflesh = 1)
+	required_reagents = list(/datum/reagent/consumable/caramel = 1, /datum/reagent/consumable/cornoil = 1, /datum/reagent/medicine/synthflesh = 1)
 
 
 /datum/chemical_reaction/lipolicide

GainStation13/code/modules/research/designs/biogen.dm

@@ -0,0 +1,15 @@
+/datum/design/mutagen
+	name = "10u Unstable Mutagen"
+	id = "mutagen_biogen"
+	build_type = BIOGENERATOR
+	materials = list(/datum/material/biomass = 25)
+	make_reagents = list(/datum/reagent/toxin/mutagen = 10)
+	category = list("initial","Botany Chemicals")
+
+/datum/design/flour
+	name = "10u Flour"
+	id = "flour_biogen"
+	build_type = BIOGENERATOR
+	materials = list(/datum/material/biomass = 25)
+	make_reagents = list(/datum/reagent/consumable/flour = 10)
+	category = list("initial","Organic Materials")

GainStation13/code/modules/research/designs/nutri_designs.dm

@@ -85,7 +85,7 @@
 	id = "bluespace_belt"
 	build_type = PROTOLATHE
 	construction_time = 100
-	materials = list(/datum/material/silver = 4000, /datum/material/gold = 4000, MAT_BLUESPACE = 2000, )
+	materials = list(/datum/material/silver = 4000, /datum/material/gold = 4000, /datum/material/bluespace = 2000, )
 	build_path = /obj/item/bluespace_belt
 	category = list("Misc", "Medical Designs")
 	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
@@ -96,7 +96,7 @@
 	id = "cookie_synthesizer"
 	build_type = PROTOLATHE
 	construction_time = 100
-	materials = list(/datum/material/silver = 4000, /datum/material/uranium = 1000, MAT_BLUESPACE = 1000, /datum/material/calorite = 2000)
+	materials = list(/datum/material/silver = 4000, /datum/material/uranium = 1000, /datum/material/bluespace = 1000, /datum/material/calorite = 2000)
 	build_path = /obj/item/cookiesynth
 	category = list("Misc", "Medical Designs")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_SERVICE
@@ -107,7 +107,7 @@
 	id = "borg_upgrade_cookiesynthesizer"
 	build_type = MECHFAB
 	build_path = /obj/item/borg/upgrade/cookiesynth
-	materials = list(/datum/material/iron=10000, /datum/material/gold=1500, /datum/material/uranium=250, MAT_PLASMA=1500)
+	materials = list(/datum/material/iron=10000, /datum/material/gold=1500, /datum/material/uranium=250, /datum/material/plasma=1500)
 	construction_time = 100
 	category = list("Cyborg Upgrade Modules")
 

GainStation13/code/xenoarch/strange_rock.dm

@@ -115,4 +115,4 @@
 	mineralSpawnChanceList = list(
 		/obj/item/stack/ore/uranium = 5, /obj/item/stack/ore/diamond = 1, /obj/item/stack/ore/gold = 10, /obj/item/stack/ore/titanium = 11,
 		/obj/item/stack/ore/silver = 12, /obj/item/stack/ore/plasma = 20, /obj/item/stack/ore/iron = 40,
-		/turf/closed/mineral/gibtonite/volcanic = 4, /obj/item/stack/ore/bluespace_crystal = 1, /obj/item/strangerock = 15, /obj/item/stack/ore/calorite = 1,) //GS13 EDIT
+		/turf/closed/mineral/gibtonite/volcanic = 4, /obj/item/stack/ore/bluespace_crystal = 1, /obj/item/strangerock = 30, /obj/item/stack/ore/calorite = 1,) //GS13 EDIT

GainStation13/code/xenoarch/tools.dm

@@ -388,7 +388,7 @@
 	desc = "A hammer that destroys 1 cm of debris."
 	id = "hammercm1"
 	build_type = PROTOLATHE
-	materials = list(MAT_PLASTIC = 500)
+	materials = list(/datum/material/plastic = 500)
 	build_path = /obj/item/xenoarch/clean/hammer/cm1
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
@@ -398,7 +398,7 @@
 	desc = "A hammer that destroys 2 cm of debris."
 	id = "hammercm2"
 	build_type = PROTOLATHE
-	materials = list(MAT_PLASTIC = 500)
+	materials = list(/datum/material/plastic = 500)
 	build_path = /obj/item/xenoarch/clean/hammer/cm2
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
@@ -408,7 +408,7 @@
 	desc = "A hammer that destroys 3 cm of debris."
 	id = "hammercm3"
 	build_type = PROTOLATHE
-	materials = list(MAT_PLASTIC = 500)
+	materials = list(/datum/material/plastic = 500)
 	build_path = /obj/item/xenoarch/clean/hammer/cm3
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
@@ -418,7 +418,7 @@
 	desc = "A hammer that destroys 4 cm of debris."
 	id = "hammercm4"
 	build_type = PROTOLATHE
-	materials = list(MAT_PLASTIC = 500)
+	materials = list(/datum/material/plastic = 500)
 	build_path = /obj/item/xenoarch/clean/hammer/cm4
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
@@ -428,7 +428,7 @@
 	desc = "A hammer that destroys 5 cm of debris."
 	id = "hammercm5"
 	build_type = PROTOLATHE
-	materials = list(MAT_PLASTIC = 500)
+	materials = list(/datum/material/plastic = 500)
 	build_path = /obj/item/xenoarch/clean/hammer/cm5
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
@@ -438,7 +438,7 @@
 	desc = "A hammer that destroys 6 cm of debris."
 	id = "hammercm6"
 	build_type = PROTOLATHE
-	materials = list(MAT_PLASTIC = 500)
+	materials = list(/datum/material/plastic = 500)
 	build_path = /obj/item/xenoarch/clean/hammer/cm6
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
@@ -448,7 +448,7 @@
 	desc = "A hammer that destroys 15 cm of debris."
 	id = "hammercm15"
 	build_type = PROTOLATHE
-	materials = list(MAT_PLASTIC = 500)
+	materials = list(/datum/material/plastic = 500)
 	build_path = /obj/item/xenoarch/clean/hammer/cm15
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
@@ -458,7 +458,7 @@
 	desc = "A hammer that destroys up to 30 cm of debris."
 	id = "hammercmadv"
 	build_type = PROTOLATHE
-	materials = list(MAT_PLASTIC = 1500)
+	materials = list(/datum/material/plastic = 1500)
 	build_path = /obj/item/xenoarch/clean/hammer/advanced
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
@@ -468,7 +468,7 @@
 	desc = "A brush that cleans debris."
 	id = "hammerbrush"
 	build_type = PROTOLATHE
-	materials = list(MAT_PLASTIC = 500)
+	materials = list(/datum/material/plastic = 500)
 	build_path = /obj/item/xenoarch/clean/brush/basic
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
@@ -478,7 +478,7 @@
 	desc = "A brush that cleans debris."
 	id = "hammerbrushadv"
 	build_type = PROTOLATHE
-	materials = list(MAT_PLASTIC = 1500)
+	materials = list(/datum/material/plastic = 1500)
 	build_path = /obj/item/xenoarch/clean/brush/adv
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
@@ -490,7 +490,7 @@
 	desc = "A tool that scans depths of rocks."
 	id = "xenoscanner"
 	build_type = PROTOLATHE
-	materials = list(MAT_PLASTIC = 500)
+	materials = list(/datum/material/plastic = 500)
 	build_path = /obj/item/xenoarch/help/scanner
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
@@ -500,7 +500,7 @@
 	desc = "A tool that scans depths of rocks."
 	id = "advxenoscanner"
 	build_type = PROTOLATHE
-	materials = list(MAT_PLASTIC = 1500)
+	materials = list(/datum/material/plastic = 1500)
 	build_path = /obj/item/xenoarch/help/scanneradv
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
@@ -510,7 +510,7 @@
 	desc = "A tool to measure the dug depth of rocks."
 	id = "xenomeasure"
 	build_type = PROTOLATHE
-	materials = list(MAT_PLASTIC = 500)
+	materials = list(/datum/material/plastic = 500)
 	build_path = /obj/item/xenoarch/help/measuring
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
@@ -520,7 +520,7 @@
 	desc = "A tool used to get research points from artifacts."
 	id = "xenoresearch"
 	build_type = PROTOLATHE
-	materials = list(MAT_PLASTIC = 1000)
+	materials = list(/datum/material/plastic = 1000)
 	build_path = /obj/item/xenoarch/help/research
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
@@ -530,7 +530,7 @@
 	desc = "A tool to extract the seeds from prehistoric fossils."
 	id = "xenoplant"
 	build_type = PROTOLATHE
-	materials = list(MAT_PLASTIC = 1000)
+	materials = list(/datum/material/plastic = 1000)
 	build_path = /obj/item/xenoarch/help/plant
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
@@ -540,7 +540,7 @@
 	desc = "A tool used to sell items, virtually."
 	id = "advcargoscanner"
 	build_type = PROTOLATHE
-	materials = list(MAT_PLASTIC = 1000, MAT_BLUESPACE = 1000)
+	materials = list(/datum/material/plastic = 1000, /datum/material/bluespace = 1000)
 	build_path = /obj/item/xenoarch/help/cargo
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_CARGO
@@ -550,7 +550,7 @@
 	desc = "A belt used to store some xenoarch tools."
 	id = "xenobelt"
 	build_type = PROTOLATHE
-	materials = list(MAT_PLASTIC = 2000)
+	materials = list(/datum/material/plastic = 2000)
 	build_path = /obj/item/storage/belt/xenoarch
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
@@ -560,7 +560,7 @@
 	desc = "A bag used to store 10 strange rocks."
 	id = "xenorockback"
 	build_type = PROTOLATHE
-	materials = list(MAT_PLASTIC = 2000)
+	materials = list(/datum/material/plastic = 2000)
 	build_path = /obj/item/storage/bag/strangerock
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
@@ -570,7 +570,7 @@
 	desc = "A bluespace bag used to store 50 strange rocks."
 	id = "xenorockbackadv"
 	build_type = PROTOLATHE
-	materials = list(MAT_PLASTIC = 2000, MAT_BLUESPACE = 1000)
+	materials = list(/datum/material/plastic = 2000, /datum/material/bluespace = 1000)
 	build_path = /obj/item/storage/bag/strangerockadv
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE

code/__DEFINES/citadel_defines.dm

@@ -9,10 +9,11 @@
 #define BUTT_LAYER_INDEX		1
 #define VAGINA_LAYER_INDEX		2
 #define TESTICLES_LAYER_INDEX	3
-#define GENITAL_LAYER_INDEX		4
-#define PENIS_LAYER_INDEX		5
+#define BELLY_LAYER_INDEX		4
+#define GENITAL_LAYER_INDEX		5
+#define PENIS_LAYER_INDEX		6
 
-#define GENITAL_LAYER_INDEX_LENGTH 5 //keep it updated with each new index added, thanks.
+#define GENITAL_LAYER_INDEX_LENGTH 6 //keep it updated with each new index added, thanks.
 
 //genital flags
 #define GENITAL_BLACKLISTED		(1<<0) //for genitals that shouldn't be added to GLOB.genitals_list.
@@ -66,9 +67,14 @@
 #define BUTT_SIZE_DEF		1
 #define BUTT_SIZE_MAX		10  //butt genitals are special in that they have caps. if there's the event there's even bigger butt sprites, raise this number.
 
-#define BELLY_SIZE_DEF	0
+#define BELLY_SIZE_DEF	1
 #define BELLY_SIZE_MAX	10
 
+//GS13 Port - Add back Arousal
+#define AROUSAL_MINIMUM_DEFAULT 	0
+#define AROUSAL_MAXIMUM_DEFAULT 	100
+#define AROUSAL_START_VALUE			1
+
 //visibility toggles defines to avoid errors typos code errors.
 #define GEN_VISIBLE_ALWAYS "Always visible"
 #define GEN_VISIBLE_NO_CLOTHES "Hidden by clothes"

code/__DEFINES/hud.dm

@@ -98,6 +98,7 @@
 #define ui_health "EAST-1:28,CENTER-1:15"
 #define ui_internal "EAST-1:28,CENTER+1:19"//CIT CHANGE - moves internal icon up a little bit to accommodate for the stamina meter
 #define ui_mood "EAST-1:28,CENTER-3:10"
+#define ui_arousal "EAST-1:28,CENTER-4:8"
 // #define ui_spacesuit "EAST-1:28,CENTER-4:10"
 
 //Pop-up inventory

code/__DEFINES/maps.dm

@@ -137,6 +137,7 @@ require only minor tweaks.
 	ZTRAIT_LAVA_UNDERGROUND = TRUE, \
 	ZTRAIT_BOMBCAP_MULTIPLIER = 2, \
 	ZTRAIT_UP = 1, \
+	ZTRAIT_ASHSTORM = FALSE, \
 	ZTRAIT_BASETURF = /turf/open/lava/smooth/lava_land_surface)
 
 #define ZTRAITS_DINER list(ZTRAIT_DINER = TRUE, ZTRAIT_BOMBCAP_MULTIPLIER = 0.5)

code/__DEFINES/research/stock_parts.dm

@@ -2,4 +2,4 @@
 /// Efficiency scaling for stock part level to material usage. All code concerning lathing and production from raw material sheet should be using this.
 #define STANDARD_PART_LEVEL_LATHE_COEFFICIENT(level)		clamp(1 - (level * 0.1), 0, 1)
 /// Efficiency scaling for stock part level to ore factor. All code concerning lathing and production from raw ores to raw material sheets should be using this.
-#define STANDARD_PART_LEVEL_ORE_COEFFICIENT(level)			clamp(1 + (level * 0.125), 1, 10)
+#define STANDARD_PART_LEVEL_ORE_COEFFICIENT(level)			clamp(1 + (level * 0.25), 1, 10) //GS13 EDIT, original level mult 0.125

code/__HELPERS/_cit_helpers.dm

@@ -144,6 +144,17 @@ GLOBAL_VAR_INIT(miscreants_allowed, FALSE)
 		if(I.body_parts_covered & GROIN)
 			return FALSE
 	return TRUE
+//GS13 Port - Arousal
+/mob/living/carbon/proc/is_butt_exposed(var/list/L)
+	if(!L)
+		L = get_equipped_items()
+	for(var/obj/item/I in L)
+		if(I.body_parts_covered & GROIN)
+			if(!I.do_not_cover_butt)
+				return FALSE
+			else
+				return TRUE
+	return TRUE
 
 /mob/living/carbon/proc/is_chest_exposed(list/L)
 	if(!L)

code/__HELPERS/mobs.dm

@@ -215,6 +215,7 @@
 		"butt_color"		= pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"),
 		// GS13 EDIT START - BELLY
 		"has_belly" 		= FALSE,
+		"belly_size"		= BELLY_SIZE_DEF,
 		"hide_belly" 		= FALSE,
 		"inflatable_belly" 	= FALSE,
 		"belly_color" 		= pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"),
@@ -225,6 +226,7 @@
 		"cock_visibility"	= GEN_VISIBLE_NO_UNDIES,
 		"vag_visibility"	= GEN_VISIBLE_NO_UNDIES,
 		"butt_visibility"	= GEN_VISIBLE_NO_UNDIES,
+		"belly_visibility"  = GEN_VISIBLE_NO_UNDIES,
 		"ipc_screen"		= snowflake_ipc_antenna_list ? pick(snowflake_ipc_antenna_list) : "None",
 		"ipc_antenna"		= "None",
 		"flavor_text"		= "",

code/_onclick/hud/hud.dm

@@ -88,6 +88,9 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
 	var/atom/movable/screen/healthdoll
 	var/atom/movable/screen/internals
 
+	//GS13 Port - Add back Arousal
+	var/atom/movable/screen/arousal
+
 	var/atom/movable/screen/wanted/wanted_lvl
 	// subtypes can override this to force a specific UI style
 	var/ui_style
@@ -144,6 +147,7 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
 	healthdoll = null
 	wanted_lvl = null
 	internals = null
+	arousal = null
 	lingchemdisplay = null
 	devilsouldisplay = null
 	lingstingdisplay = null

code/_onclick/hud/human.dm

@@ -430,6 +430,12 @@
 		infodisplay += staminabuffer
 	//END OF CIT CHANGES
 
+	//GS13 Port - adds arousal and stamina to hud
+	arousal = new /atom/movable/screen/arousal()
+	arousal.icon_state = (owner.canbearoused == 1 ? "arousal0" : "")
+	arousal.hud = src
+	infodisplay += arousal
+
 	healthdoll = new /atom/movable/screen/healthdoll()
 	healthdoll.hud = src
 	infodisplay += healthdoll

code/controllers/configuration/entries/respawns.dm

@@ -1,28 +1,29 @@
+//GS13 - lot of changes were included here, mostly allowing people to respawn very easily, even as the same characters
 /// Allows usage of respawn system
 /datum/config_entry/flag/respawns_enabled
-	default = FALSE
+	default = TRUE
 
 /// Minutes before allowing respawns.
 /datum/config_entry/number/respawn_delay
-	default = 15.0
+	default = 1.0
 	integer = FALSE
 
 /// Minutes before allowing respawn, if user cryo'd.
 /datum/config_entry/number/respawn_delay_cryo
-	default = 5.0
+	default = 1.0
 	integer = FALSE
 
 /// Allows respawning as non-assistant. Overrides all others of this type.
 /datum/config_entry/flag/allow_non_assistant_respawn
-	default = FALSE
+	default = TRUE
 
 /// Allows respawning as a combat role, defined as security/head.
 /datum/config_entry/flag/allow_combat_role_respawn
-	default = FALSE
+	default = TRUE
 
 /// Allows respawning as the same character as a previous life
 /datum/config_entry/flag/allow_same_character_respawn
-	default = FALSE
+	default = TRUE
 
 /// Observing penalizes for respawns, not just joining.
 /datum/config_entry/flag/respawn_penalty_includes_observe
@@ -30,7 +31,7 @@
 
 /// Minutes from roundstart before someone can respawn
 /datum/config_entry/number/respawn_minimum_delay_roundstart
-	default = 30.0
+	default = 1.0
 	integer = FALSE
 
 /// Gamemode config tags that are banned from respawning

code/controllers/subsystem/economy.dm

@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(economy)
 	name = "Economy"
-	wait = 5 MINUTES
+	wait = 30 MINUTES //GS13 EDIT - ORIGINAL = 5
 	init_order = INIT_ORDER_ECONOMY
 	runlevels = RUNLEVEL_GAME
 	var/roundstart_paychecks = 5

code/controllers/subsystem/processing/quirks.dm

@@ -17,7 +17,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 /datum/controller/subsystem/processing/quirks/Initialize(timeofday)
 	if(!quirks.len)
 		SetupQuirks()
-		quirk_blacklist = list(list("Blind","Nearsighted"),list("Jolly","Depression","Apathetic"),list("Ageusia","Deviant Tastes"),list("Ananas Affinity","Ananas Aversion"),list("Alcohol Tolerance","Alcohol Intolerance"),list("Alcohol Intolerance","Drunken Resilience"))
+		quirk_blacklist = list(list("Blind","Nearsighted"),list("Jolly","Depression","Apathetic"),list("Ageusia","Deviant Tastes"),list("Ananas Affinity","Ananas Aversion"),list("Alcohol Tolerance","Alcohol Intolerance"),list("Alcohol Intolerance","Drunken Resilience"), list("Weak Legs", "Strong Legs"), list("Fat Affinity","Fat Aversion")) //GS13 EDIT
 	return ..()
 
 /datum/controller/subsystem/processing/quirks/proc/SetupQuirks()

code/controllers/subsystem/title.dm

@@ -32,7 +32,7 @@ SUBSYSTEM_DEF(title)
 		file_path = "[global.config.directory]/title_screens/images/[pick(title_screens)]"
 
 	if(!file_path)
-		file_path = "icons/runtime/default_title.dmi"
+		file_path = "GainStation13/icons/runtime/default_title.dmi"
 
 	ASSERT(fexists(file_path))
 

code/datums/mind.dm

@@ -169,6 +169,8 @@
 		var/mob/living/L = new_character
 		if(L.client?.prefs && L.client.prefs.auto_ooc && L.client.prefs.chat_toggles & CHAT_OOC)
 			L.client.prefs.chat_toggles &= ~(CHAT_OOC)
+			L.canbearoused = L.client?.prefs?.arousable //Technically this should make taking over a character mean the body gain the new minds setting...
+			L.update_arousal_hud() //Removes the old icon
 
 	hide_ckey = current.client?.prefs?.hide_ckey
 

code/datums/status_effects/buffs.dm

@@ -573,7 +573,7 @@
 	duration = 1 MINUTES
 	status_type = STATUS_EFFECT_REPLACE
 	alert_type = /atom/movable/screen/alert/status_effect/regenerative_core
-	var/heal_amount = 25
+	var/heal_amount = 60
 
 /datum/status_effect/regenerative_core/on_apply()
 	. = ..()

code/game/area/areas.dm

@@ -558,7 +558,7 @@ GLOBAL_LIST_EMPTY(teleportlocs)
 	// Ambience goes down here -- make sure to list each area separately for ease of adding things in later, thanks! Note: areas adjacent to each other should have the same sounds to prevent cutoff when possible.- LastyScratch
 	if(L.client && !L.client.ambience_playing && L.client.prefs.toggles & SOUND_SHIP_AMBIENCE)
 		L.client.ambience_playing = 1
-		SEND_SOUND(L, sound('sound/ambience/shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = CHANNEL_BUZZ))
+		SEND_SOUND(L, sound('GainStation13/sound/ambience/shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = CHANNEL_BUZZ)) // GS13 EDIT AMBIENCE
 
 	if(!(L.client && (L.client.prefs.toggles & SOUND_AMBIENCE)))
 		return //General ambience check is below the ship ambience so one can play without the other

code/game/atoms.dm

@@ -94,6 +94,7 @@
 	var/datum/wires/wires = null
 
 	var/icon/blood_splatter_icon
+	var/icon/cum_splatter_icon
 	var/list/fingerprints
 	var/list/fingerprintshidden
 	var/list/blood_DNA

code/game/machinery/computer/camera_advanced.dm

@@ -102,7 +102,7 @@
 	return TRUE
 
 /obj/machinery/computer/camera_advanced/abductor/can_use(mob/user)
-	if(!isabductor(user))
+	if(check_if_abductor && !isabductor(user))
 		return FALSE
 	return ..()
 

code/game/machinery/quantum_pad.dm

@@ -139,7 +139,7 @@
 				to_chat(user, "<span class='warning'>[src] is unpowered!</span>")
 				teleporting = FALSE
 				return
-			if(!target_pad || QDELETED(target_pad) || (needs_power && (target_pad.machine_stat & NOPOWER))) // GS13 EDIT
+			if(!target_pad || QDELETED(target_pad) || (target_pad.needs_power && (target_pad.machine_stat & NOPOWER))) // GS13 EDIT
 				to_chat(user, "<span class='warning'>Linked pad is not responding to ping. Teleport aborted.</span>")
 				teleporting = FALSE
 				return

code/game/objects/items.dm

@@ -181,6 +181,9 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 	/// Used if we want to have a custom verb text for throwing. "John Spaceman flicks the ciggerate" for example.
 	var/throw_verb
 
+	//GS13 Port - Hyper, for clothes that reveal your behind! butt stuff, you know how it is.
+	var/do_not_cover_butt = FALSE
+
 /obj/item/Initialize(mapload)
 
 	if(attack_verb)

code/game/objects/items/devices/radio/radio.dm

@@ -203,6 +203,7 @@
 	if(!language)
 		language = M.get_selected_language()
 	INVOKE_ASYNC(src, PROC_REF(talk_into_impl), M, message, channel, spans.Copy(), language)
+	playsound(src, 'GainStation13/sound/voice/radioin.ogg', 25, 0) //GS13 EDIT
 	return ITALICS | REDUCE_RANGE
 
 /obj/item/radio/proc/talk_into_impl(atom/movable/M, message, channel, list/spans, datum/language/language)

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -25,6 +25,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
 	new/datum/stack_recipe("bar stool", /obj/structure/chair/stool/bar, one_per_turf = TRUE, on_floor = TRUE), \
 	new/datum/stack_recipe("bed", /obj/structure/bed, 2, one_per_turf = TRUE, on_floor = TRUE), \
 	new/datum/stack_recipe("double bed", /obj/structure/bed/double, 4, one_per_turf = TRUE, on_floor = TRUE), \
+	new/datum/stack_recipe("scale", /obj/structure/scale, 3, one_per_turf = TRUE, on_floor = TRUE), \
 	//CIT CHANGE - adds sofas to metal recipe list
 	new/datum/stack_recipe_list("sofas", list( \
 		new /datum/stack_recipe("sofa (middle)", /obj/structure/chair/sofa, one_per_turf = TRUE, on_floor = TRUE), \

code/game/objects/structures/false_walls.dm

@@ -1,11 +1,13 @@
 /*
  * False Walls
  */
+
+//GS13: Most of these walls have icon paths changed to GS13 folders
 /obj/structure/falsewall
 	name = "wall"
 	desc = "A huge chunk of metal used to separate rooms."
 	anchored = TRUE
-	icon = 'icons/turf/walls/wall.dmi'
+	icon = 'GainStation13/icons/turf/walls/wall.dmi'
 	icon_state = "wall"
 	plane = WALL_PLANE
 	layer = LOW_OBJ_LAYER
@@ -147,7 +149,7 @@
 /obj/structure/falsewall/reinforced
 	name = "reinforced wall"
 	desc = "A huge chunk of reinforced metal used to separate rooms."
-	icon = 'icons/turf/walls/reinforced_wall.dmi'
+	icon = 'GainStation13/icons/turf/walls/reinforced_wall.dmi'
 	icon_state = "r_wall"
 	walltype = /turf/closed/wall/r_wall
 	mineral = /obj/item/stack/sheet/plasteel
@@ -168,7 +170,7 @@
 /obj/structure/falsewall/uranium
 	name = "uranium wall"
 	desc = "A wall with uranium plating. This is probably a bad idea."
-	icon = 'icons/turf/walls/uranium_wall.dmi'
+	icon = 'GainStation13/icons/turf/walls/uranium_wall.dmi'
 	icon_state = "uranium"
 	mineral = /obj/item/stack/sheet/mineral/uranium
 	walltype = /turf/closed/wall/mineral/uranium
@@ -202,7 +204,7 @@
 /obj/structure/falsewall/gold
 	name = "gold wall"
 	desc = "A wall with gold plating. Swag!"
-	icon = 'icons/turf/walls/gold_wall.dmi'
+	icon = 'GainStation13/icons/turf/walls/gold_wall.dmi'
 	icon_state = "gold"
 	mineral = /obj/item/stack/sheet/mineral/gold
 	walltype = /turf/closed/wall/mineral/gold
@@ -211,7 +213,7 @@
 /obj/structure/falsewall/silver
 	name = "silver wall"
 	desc = "A wall with silver plating. Shiny."
-	icon = 'icons/turf/walls/silver_wall.dmi'
+	icon = 'GainStation13/icons/turf/walls/silver_wall.dmi'
 	icon_state = "silver"
 	mineral = /obj/item/stack/sheet/mineral/silver
 	walltype = /turf/closed/wall/mineral/silver
@@ -220,7 +222,7 @@
 /obj/structure/falsewall/diamond
 	name = "diamond wall"
 	desc = "A wall with diamond plating. You monster."
-	icon = 'icons/turf/walls/diamond_wall.dmi'
+	icon = 'GainStation13/icons/turf/walls/diamond_wall.dmi'
 	icon_state = "diamond"
 	mineral = /obj/item/stack/sheet/mineral/diamond
 	walltype = /turf/closed/wall/mineral/diamond
@@ -230,7 +232,7 @@
 /obj/structure/falsewall/plasma
 	name = "plasma wall"
 	desc = "A wall with plasma plating. This is definitely a bad idea."
-	icon = 'icons/turf/walls/plasma_wall.dmi'
+	icon = 'GainStation13/icons/turf/walls/plasma_wall.dmi'
 	icon_state = "plasma"
 	mineral = /obj/item/stack/sheet/mineral/plasma
 	walltype = /turf/closed/wall/mineral/plasma
@@ -258,7 +260,7 @@
 /obj/structure/falsewall/bananium
 	name = "bananium wall"
 	desc = "A wall with bananium plating. Honk!"
-	icon = 'icons/turf/walls/bananium_wall.dmi'
+	icon = 'GainStation13/icons/turf/walls/bananium_wall.dmi'
 	icon_state = "bananium"
 	mineral = /obj/item/stack/sheet/mineral/bananium
 	walltype = /turf/closed/wall/mineral/bananium
@@ -268,7 +270,7 @@
 /obj/structure/falsewall/sandstone
 	name = "sandstone wall"
 	desc = "A wall with sandstone plating. Rough."
-	icon = 'icons/turf/walls/sandstone_wall.dmi'
+	icon = 'GainStation13/icons/turf/walls/sandstone_wall.dmi'
 	icon_state = "sandstone"
 	mineral = /obj/item/stack/sheet/mineral/sandstone
 	walltype = /turf/closed/wall/mineral/sandstone
@@ -277,7 +279,7 @@
 /obj/structure/falsewall/wood
 	name = "wooden wall"
 	desc = "A wall with wooden plating. Stiff."
-	icon = 'icons/turf/walls/wood_wall.dmi'
+	icon = 'GainStation13/icons/turf/walls/wood_wall.dmi'
 	icon_state = "wood"
 	mineral = /obj/item/stack/sheet/mineral/wood
 	walltype = /turf/closed/wall/mineral/wood
@@ -286,7 +288,7 @@
 /obj/structure/falsewall/iron
 	name = "rough metal wall"
 	desc = "A wall with rough metal plating."
-	icon = 'icons/turf/walls/iron_wall.dmi'
+	icon = 'GainStation13/icons/turf/walls/iron_wall.dmi'
 	icon_state = "iron"
 	mineral = /obj/item/stack/rods
 	mineral_amount = 5
@@ -315,7 +317,7 @@
 /obj/structure/falsewall/plastitanium
 	name = "wall"
 	desc = "An evil wall of plasma and titanium."
-	icon = 'icons/turf/walls/plastitanium_wall.dmi'
+	icon = 'GainStation13/icons/turf/walls/plastitanium_wall.dmi'
 	icon_state = "shuttle"
 	mineral = /obj/item/stack/sheet/mineral/plastitanium
 	walltype = /turf/closed/wall/mineral/plastitanium

code/game/objects/structures/mirror.dm

@@ -21,6 +21,7 @@
 
 	if(ishuman(user))
 		var/mob/living/carbon/human/H = user
+		H.checkloadappearance() // GS13 EDIT
 		//see code/modules/mob/dead/new_player/preferences.dm at approx line 545 for comments!
 		//this is largely copypasted from there.
 

code/game/objects/structures/window.dm

@@ -687,35 +687,129 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
 /* Full Tile Windows (more obj_integrity) */
 
 /obj/structure/window/fulltile
-	icon = 'icons/obj/smooth_structures/window.dmi'
+	icon = 'GainStation13/icons/obj/smooth_structures/window.dmi' //GS13 - bunch of icon path edits here and below
 	icon_state = "window"
 	dir = FULLTILE_WINDOW_DIR
 	max_integrity = 50
 	fulltile = TRUE
 	flags_1 = PREVENT_CLICK_UNDER_1
 	smooth = SMOOTH_TRUE
-	canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/plasma/fulltile, /obj/structure/window/plasma/reinforced/fulltile)
+
+	canSmoothWith = list(
+	/turf/closed/wall,
+	/turf/closed/wall/r_wall,
+	/obj/structure/falsewall,
+	/obj/structure/falsewall/brass,
+	/obj/structure/falsewall/reinforced,
+	/turf/closed/wall/rust,
+	/turf/closed/wall/r_wall/rust,
+	/turf/closed/wall/clockwork,
+	/turf/closed/indestructible/riveted/,
+	/turf/closed/indestructible/riveted/uranium,
+	/obj/structure/window/fulltile,
+	/obj/structure/window/reinforced/fulltile,
+	/obj/structure/window/reinforced/tinted/fulltile,
+	/obj/machinery/door,
+	/obj/machinery/door/airlock/,
+	/obj/machinery/door/airlock/mining,
+	/obj/machinery/door/airlock/mining/glass,
+	/obj/machinery/door/airlock/medical,
+	/obj/machinery/door/airlock/medical/glass,
+	/obj/machinery/door/airlock/public,
+	/obj/machinery/door/airlock/public/glass,
+	/obj/machinery/door/airlock/research,
+	/obj/machinery/door/airlock/research/glass,
+	/obj/machinery/door/airlock/maintenance,
+	/obj/machinery/door/airlock/maintenance/glass,
+	/obj/machinery/door/airlock/command/,
+	/obj/machinery/door/airlock/command/glass,
+	/obj/machinery/door/airlock/engineering,
+	/obj/machinery/door/airlock/engineering/glass,
+	/obj/machinery/door/airlock/engineering/abandoned,
+	/obj/machinery/door/airlock/security,
+	/obj/machinery/door/airlock/security/glass,
+	/obj/machinery/door/airlock/maintenance/abandoned,
+	/obj/machinery/door/poddoor/shutters/preopen,
+	/obj/machinery/door/poddoor/shutters,
+	/obj/machinery/door/window/eastright,
+	/obj/machinery/door/window/eastleft,
+	/obj/machinery/door/window/northleft,
+	/obj/machinery/door/window/northright,
+	/obj/machinery/door/airlock/external,
+	/obj/machinery/door/airlock,
+	/obj/machinery/door/airlock/hatch,
+	/obj/machinery/door/airlock/engineering/glass/critical,
+	/obj/machinery/door/airlock/atmos,
+	/obj/machinery/door/airlock/highsecurity,)
+
 	glass_amount = 2
 
 /obj/structure/window/fulltile/unanchored
 	anchored = FALSE
 
 /obj/structure/window/plasma/fulltile
-	icon = 'icons/obj/smooth_structures/plasma_window.dmi'
+	icon = 'GainStation13/icons/obj/smooth_structures/plasma_window.dmi'
 	icon_state = "plasmawindow"
 	dir = FULLTILE_WINDOW_DIR
 	max_integrity = 300
 	fulltile = TRUE
 	flags_1 = PREVENT_CLICK_UNDER_1
 	smooth = SMOOTH_TRUE
-	canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/plasma/fulltile, /obj/structure/window/plasma/reinforced/fulltile)
+
+	canSmoothWith = list(
+	/turf/closed/wall,
+	/turf/closed/wall/r_wall,
+	/obj/structure/falsewall,
+	/obj/structure/falsewall/brass,
+	/obj/structure/falsewall/reinforced,
+	/turf/closed/wall/rust,
+	/turf/closed/wall/r_wall/rust,
+	/turf/closed/wall/clockwork,
+	/turf/closed/indestructible/riveted/,
+	/turf/closed/indestructible/riveted/uranium,
+	/obj/structure/window/fulltile,
+	/obj/structure/window/reinforced/fulltile,
+	/obj/structure/window/reinforced/tinted/fulltile,
+	/obj/machinery/door,
+	/obj/machinery/door/airlock/,
+	/obj/machinery/door/airlock/mining,
+	/obj/machinery/door/airlock/mining/glass,
+	/obj/machinery/door/airlock/medical,
+	/obj/machinery/door/airlock/medical/glass,
+	/obj/machinery/door/airlock/public,
+	/obj/machinery/door/airlock/public/glass,
+	/obj/machinery/door/airlock/research,
+	/obj/machinery/door/airlock/research/glass,
+	/obj/machinery/door/airlock/maintenance,
+	/obj/machinery/door/airlock/maintenance/glass,
+	/obj/machinery/door/airlock/command/,
+	/obj/machinery/door/airlock/command/glass,
+	/obj/machinery/door/airlock/engineering,
+	/obj/machinery/door/airlock/engineering/glass,
+	/obj/machinery/door/airlock/engineering/abandoned,
+	/obj/machinery/door/airlock/security,
+	/obj/machinery/door/airlock/security/glass,
+	/obj/machinery/door/airlock/maintenance/abandoned,
+	/obj/machinery/door/poddoor/shutters/preopen,
+	/obj/machinery/door/poddoor/shutters,
+	/obj/machinery/door/window/eastright,
+	/obj/machinery/door/window/eastleft,
+	/obj/machinery/door/window/northleft,
+	/obj/machinery/door/window/northright,
+	/obj/machinery/door/airlock/external,
+	/obj/machinery/door/airlock,
+	/obj/machinery/door/airlock/hatch,
+	/obj/machinery/door/airlock/engineering/glass/critical,
+	/obj/machinery/door/airlock/atmos,
+	/obj/machinery/door/airlock/highsecurity,)
+
 	glass_amount = 2
 
 /obj/structure/window/plasma/fulltile/unanchored
 	anchored = FALSE
 
 /obj/structure/window/plasma/reinforced/fulltile
-	icon = 'icons/obj/smooth_structures/rplasma_window.dmi'
+	icon = 'GainStation13/icons/obj/smooth_structures/rplasma_window.dmi'
 	icon_state = "rplasmawindow"
 	dir = FULLTILE_WINDOW_DIR
 	max_integrity = 1000
@@ -728,14 +822,61 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
 	anchored = FALSE
 
 /obj/structure/window/reinforced/fulltile
-	icon = 'icons/obj/smooth_structures/reinforced_window.dmi'
+	icon = 'GainStation13/icons/obj/smooth_structures/reinforced_window.dmi'
 	icon_state = "r_window"
 	dir = FULLTILE_WINDOW_DIR
 	max_integrity = 100
 	fulltile = TRUE
 	flags_1 = PREVENT_CLICK_UNDER_1
 	smooth = SMOOTH_TRUE
-	canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/plasma/fulltile, /obj/structure/window/plasma/reinforced/fulltile)
+
+	canSmoothWith = list(
+	/turf/closed/wall,
+	/turf/closed/wall/r_wall,
+	/obj/structure/falsewall,
+	/obj/structure/falsewall/brass,
+	/obj/structure/falsewall/reinforced,
+	/turf/closed/wall/rust,
+	/turf/closed/wall/r_wall/rust,
+	/turf/closed/wall/clockwork,
+	/turf/closed/indestructible/riveted/,
+	/turf/closed/indestructible/riveted/uranium,
+	/obj/structure/window/fulltile,
+	/obj/structure/window/reinforced/fulltile,
+	/obj/structure/window/reinforced/tinted/fulltile,
+	/obj/machinery/door,
+	/obj/machinery/door/airlock/,
+	/obj/machinery/door/airlock/mining,
+	/obj/machinery/door/airlock/mining/glass,
+	/obj/machinery/door/airlock/medical,
+	/obj/machinery/door/airlock/medical/glass,
+	/obj/machinery/door/airlock/public,
+	/obj/machinery/door/airlock/public/glass,
+	/obj/machinery/door/airlock/research,
+	/obj/machinery/door/airlock/research/glass,
+	/obj/machinery/door/airlock/maintenance,
+	/obj/machinery/door/airlock/maintenance/glass,
+	/obj/machinery/door/airlock/command/,
+	/obj/machinery/door/airlock/command/glass,
+	/obj/machinery/door/airlock/engineering,
+	/obj/machinery/door/airlock/engineering/glass,
+	/obj/machinery/door/airlock/engineering/abandoned,
+	/obj/machinery/door/airlock/security,
+	/obj/machinery/door/airlock/security/glass,
+	/obj/machinery/door/airlock/maintenance/abandoned,
+	/obj/machinery/door/poddoor/shutters/preopen,
+	/obj/machinery/door/poddoor/shutters,
+	/obj/machinery/door/window/eastright,
+	/obj/machinery/door/window/eastleft,
+	/obj/machinery/door/window/northleft,
+	/obj/machinery/door/window/northright,
+	/obj/machinery/door/airlock/external,
+	/obj/machinery/door/airlock,
+	/obj/machinery/door/airlock/hatch,
+	/obj/machinery/door/airlock/engineering/glass/critical,
+	/obj/machinery/door/airlock/atmos,
+	/obj/machinery/door/airlock/highsecurity,)
+
 	level = 3
 	glass_amount = 2
 
@@ -743,13 +884,60 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
 	anchored = FALSE
 
 /obj/structure/window/reinforced/tinted/fulltile
-	icon = 'icons/obj/smooth_structures/tinted_window.dmi'
+	icon = 'GainStation13/icons/obj/smooth_structures/tinted_window.dmi'
 	icon_state = "tinted_window"
 	dir = FULLTILE_WINDOW_DIR
 	fulltile = TRUE
 	flags_1 = PREVENT_CLICK_UNDER_1
 	smooth = SMOOTH_TRUE
-	canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/plasma/fulltile, /obj/structure/window/plasma/reinforced/fulltile)
+
+	canSmoothWith = list(
+	/turf/closed/wall,
+	/turf/closed/wall/r_wall,
+	/obj/structure/falsewall,
+	/obj/structure/falsewall/brass,
+	/obj/structure/falsewall/reinforced,
+	/turf/closed/wall/rust,
+	/turf/closed/wall/r_wall/rust,
+	/turf/closed/wall/clockwork,
+	/turf/closed/indestructible/riveted/,
+	/turf/closed/indestructible/riveted/uranium,
+	/obj/structure/window/fulltile,
+	/obj/structure/window/reinforced/fulltile,
+	/obj/structure/window/reinforced/tinted/fulltile,
+	/obj/machinery/door,
+	/obj/machinery/door/airlock/,
+	/obj/machinery/door/airlock/mining,
+	/obj/machinery/door/airlock/mining/glass,
+	/obj/machinery/door/airlock/medical,
+	/obj/machinery/door/airlock/medical/glass,
+	/obj/machinery/door/airlock/public,
+	/obj/machinery/door/airlock/public/glass,
+	/obj/machinery/door/airlock/research,
+	/obj/machinery/door/airlock/research/glass,
+	/obj/machinery/door/airlock/maintenance,
+	/obj/machinery/door/airlock/maintenance/glass,
+	/obj/machinery/door/airlock/command/,
+	/obj/machinery/door/airlock/command/glass,
+	/obj/machinery/door/airlock/engineering,
+	/obj/machinery/door/airlock/engineering/glass,
+	/obj/machinery/door/airlock/engineering/abandoned,
+	/obj/machinery/door/airlock/security,
+	/obj/machinery/door/airlock/security/glass,
+	/obj/machinery/door/airlock/maintenance/abandoned,
+	/obj/machinery/door/poddoor/shutters/preopen,
+	/obj/machinery/door/poddoor/shutters,
+	/obj/machinery/door/window/eastright,
+	/obj/machinery/door/window/eastleft,
+	/obj/machinery/door/window/northleft,
+	/obj/machinery/door/window/northright,
+	/obj/machinery/door/airlock/external,
+	/obj/machinery/door/airlock,
+	/obj/machinery/door/airlock/hatch,
+	/obj/machinery/door/airlock/engineering/glass/critical,
+	/obj/machinery/door/airlock/atmos,
+	/obj/machinery/door/airlock/highsecurity,)
+
 	level = 3
 	glass_amount = 2
 
@@ -757,7 +945,54 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
 	icon = 'icons/obj/smooth_structures/rice_window.dmi'
 	icon_state = "ice_window"
 	max_integrity = 150
-	canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/plasma/fulltile, /obj/structure/window/plasma/reinforced/fulltile)
+
+	canSmoothWith = list(
+	/turf/closed/wall,
+	/turf/closed/wall/r_wall,
+	/obj/structure/falsewall,
+	/obj/structure/falsewall/brass,
+	/obj/structure/falsewall/reinforced,
+	/turf/closed/wall/rust,
+	/turf/closed/wall/r_wall/rust,
+	/turf/closed/wall/clockwork,
+	/turf/closed/indestructible/riveted/,
+	/turf/closed/indestructible/riveted/uranium,
+	/obj/structure/window/fulltile,
+	/obj/structure/window/reinforced/fulltile,
+	/obj/structure/window/reinforced/tinted/fulltile,
+	/obj/machinery/door,
+	/obj/machinery/door/airlock/,
+	/obj/machinery/door/airlock/mining,
+	/obj/machinery/door/airlock/mining/glass,
+	/obj/machinery/door/airlock/medical,
+	/obj/machinery/door/airlock/medical/glass,
+	/obj/machinery/door/airlock/public,
+	/obj/machinery/door/airlock/public/glass,
+	/obj/machinery/door/airlock/research,
+	/obj/machinery/door/airlock/research/glass,
+	/obj/machinery/door/airlock/maintenance,
+	/obj/machinery/door/airlock/maintenance/glass,
+	/obj/machinery/door/airlock/command/,
+	/obj/machinery/door/airlock/command/glass,
+	/obj/machinery/door/airlock/engineering,
+	/obj/machinery/door/airlock/engineering/glass,
+	/obj/machinery/door/airlock/engineering/abandoned,
+	/obj/machinery/door/airlock/security,
+	/obj/machinery/door/airlock/security/glass,
+	/obj/machinery/door/airlock/maintenance/abandoned,
+	/obj/machinery/door/poddoor/shutters/preopen,
+	/obj/machinery/door/poddoor/shutters,
+	/obj/machinery/door/window/eastright,
+	/obj/machinery/door/window/eastleft,
+	/obj/machinery/door/window/northleft,
+	/obj/machinery/door/window/northright,
+	/obj/machinery/door/airlock/external,
+	/obj/machinery/door/airlock,
+	/obj/machinery/door/airlock/hatch,
+	/obj/machinery/door/airlock/engineering/glass/critical,
+	/obj/machinery/door/airlock/atmos,
+	/obj/machinery/door/airlock/highsecurity,)
+
 	level = 3
 	glass_amount = 2
 

code/game/turfs/closed.dm

@@ -26,7 +26,7 @@
 
 /turf/closed/indestructible
 	name = "wall"
-	icon = 'icons/turf/walls.dmi'
+	icon = 'GainStation13/icons/turf/walls/walls.dmi'
 	explosion_block = 50
 	wave_explosion_block = INFINITY
 
@@ -54,7 +54,7 @@
 /turf/closed/indestructible/sandstone
 	name = "sandstone wall"
 	desc = "A wall with sandstone plating. Rough."
-	icon = 'icons/turf/walls/sandstone_wall.dmi'
+	icon = 'GainStation13/icons/turf/walls/sandstone_wall.dmi'
 	icon_state = "sandstone"
 	baseturfs = /turf/closed/indestructible/sandstone
 	smooth = SMOOTH_TRUE
@@ -62,7 +62,7 @@
 /turf/closed/indestructible/wood
 	name = "wooden wall"
 	desc = "A wall with wooden plating. Stiff."
-	icon = 'icons/turf/walls/wood_wall.dmi'
+	icon = 'GainStation13/icons/turf/walls/wood_wall.dmi'
 	icon_state = "wood"
 	baseturfs = /turf/closed/indestructible/wood
 	smooth = SMOOTH_TRUE
@@ -106,20 +106,20 @@ INITIALIZE_IMMEDIATE(/turf/closed/indestructible/splashscreen)
 	name = null
 	desc = null
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
-	
+
 /turf/closed/indestructible/riveted
-	icon = 'icons/turf/walls/riveted.dmi'
+	icon = 'GainStation13/icons/turf/walls/riveted.dmi'
 	icon_state = "riveted"
 	smooth = SMOOTH_TRUE
 	explosion_block = INFINITY
 
 /turf/closed/indestructible/syndicate
-	icon = 'icons/turf/walls/plastitanium_wall.dmi'
+	icon = 'GainStation13/icons/turf/walls/plastitanium_wall.dmi'
 	icon_state = "map-shuttle"
 	smooth = SMOOTH_TRUE
 
 /turf/closed/indestructible/riveted/uranium
-	icon = 'icons/turf/walls/uranium_wall.dmi'
+	icon = 'GainStation13/icons/turf/walls/uranium_wall.dmi'
 	icon_state = "uranium"
 
 /turf/closed/indestructible/abductor
@@ -167,7 +167,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/indestructible/splashscreen)
 	icon_state = "icerock"
 
 /turf/closed/indestructible/rock/snow/ice/ore
-	icon = 'icons/turf/walls/icerock_wall.dmi'
+	icon = 'GainStation13/icons/turf/walls/icerock_wall.dmi'
 	icon_state = "icerock"
 	smooth = SMOOTH_MORE|SMOOTH_BORDER
 	canSmoothWith = list (/turf/closed)

code/game/turfs/simulated/floor.dm

@@ -3,7 +3,7 @@
 	//- you should use istype() if you want to find out whether a floor has a certain type
 	//- floor_tile is now a path, and not a tile obj
 	name = "floor"
-	icon = 'icons/turf/floors.dmi'
+	icon = 'GainStation13/icons/turf/floors.dmi' //GS13 change (so our floors are used instead)
 	baseturfs = /turf/open/floor/plating
 	dirt_buildup_allowed = TRUE
 

code/game/turfs/simulated/minerals.dm

@@ -54,6 +54,10 @@
 		var/obj/item/stack/ore/the_ore = ore_type
 		scan_state = initial(the_ore.scan_state) // I SAID. SWITCH. TO. IT.
 		mineralType = ore_type // Everything else assumes that this is typed correctly so don't set it to non-ores thanks.
+	//GS13 EDIT, XENOARCH
+	if(ispath(ore_type, /obj/item/strangerock))
+		mineralType = ore_type
+
 
 /turf/closed/mineral/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
 	if(turf_type)
@@ -186,7 +190,7 @@
 /turf/closed/mineral/random
 	var/list/mineralSpawnChanceList = list(/obj/item/stack/ore/uranium = 5, /obj/item/stack/ore/diamond = 1, /obj/item/stack/ore/gold = 10,
 		/obj/item/stack/ore/silver = 12, /obj/item/stack/ore/plasma = 20, /obj/item/stack/ore/iron = 40, /obj/item/stack/ore/titanium = 11,
-		/turf/closed/mineral/gibtonite = 4, /obj/item/stack/ore/bluespace_crystal = 1)
+		/turf/closed/mineral/gibtonite = 4, /obj/item/stack/ore/bluespace_crystal = 1, /obj/item/stack/ore/calorite = 1, /obj/item/strangerock = 5)
 		//Currently, Adamantine won't spawn as it has no uses. -Durandan
 	var/mineralChance = 13
 
@@ -225,7 +229,7 @@
 	mineralChance = 25
 	mineralSpawnChanceList = list(
 		/obj/item/stack/ore/uranium = 35, /obj/item/stack/ore/diamond = 30, /obj/item/stack/ore/gold = 45, /obj/item/stack/ore/titanium = 45,
-		/obj/item/stack/ore/silver = 50, /obj/item/stack/ore/plasma = 50, /obj/item/stack/ore/bluespace_crystal = 20, /obj/item/stack/ore/calorite = 20,) //GS13 EDIT
+		/obj/item/stack/ore/silver = 50, /obj/item/stack/ore/plasma = 50, /obj/item/stack/ore/bluespace_crystal = 20, /obj/item/strangerock = 10, /obj/item/stack/ore/calorite = 20,) //GS13 EDIT
 
 /turf/closed/mineral/random/high_chance/volcanic
 	environment_type = "basalt"
@@ -235,7 +239,7 @@
 	defer_change = TRUE
 	mineralSpawnChanceList = list(
 		/obj/item/stack/ore/uranium = 35, /obj/item/stack/ore/diamond = 30, /obj/item/stack/ore/gold = 45, /obj/item/stack/ore/titanium = 45,
-		/obj/item/stack/ore/silver = 50, /obj/item/stack/ore/plasma = 50, /obj/item/stack/ore/bluespace_crystal = 20, /obj/item/stack/ore/calorite = 20,) //GS13 EDIT
+		/obj/item/stack/ore/silver = 50, /obj/item/stack/ore/plasma = 50, /obj/item/stack/ore/bluespace_crystal = 20, /obj/item/strangerock = 10, /obj/item/stack/ore/calorite = 20,) //GS13 EDIT
 
 /turf/closed/mineral/random/low_chance
 	icon_state = "rock_lowchance"
@@ -243,7 +247,7 @@
 	mineralSpawnChanceList = list(
 		/obj/item/stack/ore/uranium = 2, /obj/item/stack/ore/diamond = 1, /obj/item/stack/ore/gold = 4, /obj/item/stack/ore/titanium = 4,
 		/obj/item/stack/ore/silver = 6, /obj/item/stack/ore/plasma = 15, /obj/item/stack/ore/iron = 40,
-		/turf/closed/mineral/gibtonite = 2, /obj/item/stack/ore/bluespace_crystal = 1, /obj/item/strangerock = 3, /obj/item/stack/ore/calorite = 1,) //GS13 EDIT
+		/turf/closed/mineral/gibtonite = 2, /obj/item/stack/ore/bluespace_crystal = 1, /obj/item/strangerock = 5, /obj/item/stack/ore/calorite = 1,) //GS13 EDIT
 
 /turf/closed/mineral/random/volcanic
 	environment_type = "basalt"
@@ -256,7 +260,7 @@
 	mineralSpawnChanceList = list(
 		/obj/item/stack/ore/uranium = 5, /obj/item/stack/ore/diamond = 1, /obj/item/stack/ore/gold = 10, /obj/item/stack/ore/titanium = 11,
 		/obj/item/stack/ore/silver = 12, /obj/item/stack/ore/plasma = 20, /obj/item/stack/ore/iron = 40,
-		/turf/closed/mineral/gibtonite/volcanic = 4, /obj/item/stack/ore/bluespace_crystal = 1, /obj/item/strangerock = 3, /obj/item/stack/ore/calorite = 1,) //GS13 EDIT
+		/turf/closed/mineral/gibtonite/volcanic = 4, /obj/item/stack/ore/bluespace_crystal = 1, /obj/item/strangerock = 5, /obj/item/stack/ore/calorite = 1,) //GS13 EDIT
 
 /turf/closed/mineral/random/snow
 	name = "snowy mountainside"

code/game/turfs/simulated/wall/mineral_walls.dm

@@ -7,10 +7,13 @@
 	canSmoothWith = null
 	smooth = SMOOTH_TRUE
 
+
+//GS13: Most of these walls have icon paths changed to GS13 folders
+
 /turf/closed/wall/mineral/gold
 	name = "gold wall"
 	desc = "A wall with gold plating. Swag!"
-	icon = 'icons/turf/walls/gold_wall.dmi'
+	icon = 'GainStation13/icons/turf/walls/gold_wall.dmi'
 	icon_state = "gold"
 	sheet_type = /obj/item/stack/sheet/mineral/gold
 	explosion_block = 0 //gold is a soft metal you dingus.
@@ -19,7 +22,7 @@
 /turf/closed/wall/mineral/silver
 	name = "silver wall"
 	desc = "A wall with silver plating. Shiny!"
-	icon = 'icons/turf/walls/silver_wall.dmi'
+	icon = 'GainStation13/icons/turf/walls/silver_wall.dmi'
 	icon_state = "silver"
 	sheet_type = /obj/item/stack/sheet/mineral/silver
 	canSmoothWith = list(/turf/closed/wall/mineral/silver, /obj/structure/falsewall/silver)
@@ -27,7 +30,7 @@
 /turf/closed/wall/mineral/diamond
 	name = "diamond wall"
 	desc = "A wall with diamond plating. You monster."
-	icon = 'icons/turf/walls/diamond_wall.dmi'
+	icon = 'GainStation13/icons/turf/walls/diamond_wall.dmi'
 	icon_state = "diamond"
 	sheet_type = /obj/item/stack/sheet/mineral/diamond
 	slicing_duration = 200   //diamond wall takes twice as much time to slice
@@ -37,7 +40,7 @@
 /turf/closed/wall/mineral/bananium
 	name = "bananium wall"
 	desc = "A wall with bananium plating. Honk!"
-	icon = 'icons/turf/walls/bananium_wall.dmi'
+	icon = 'GainStation13/icons/turf/walls/bananium_wall.dmi'
 	icon_state = "bananium"
 	sheet_type = /obj/item/stack/sheet/mineral/bananium
 	canSmoothWith = list(/turf/closed/wall/mineral/bananium, /obj/structure/falsewall/bananium)
@@ -45,7 +48,7 @@
 /turf/closed/wall/mineral/sandstone
 	name = "sandstone wall"
 	desc = "A wall with sandstone plating. Rough."
-	icon = 'icons/turf/walls/sandstone_wall.dmi'
+	icon = 'GainStation13/icons/turf/walls/sandstone_wall.dmi'
 	icon_state = "sandstone"
 	sheet_type = /obj/item/stack/sheet/mineral/sandstone
 	explosion_block = 0
@@ -55,7 +58,7 @@
 	article = "a"
 	name = "uranium wall"
 	desc = "A wall with uranium plating. This is probably a bad idea."
-	icon = 'icons/turf/walls/uranium_wall.dmi'
+	icon = 'GainStation13/icons/turf/walls/uranium_wall.dmi'
 	icon_state = "uranium"
 	sheet_type = /obj/item/stack/sheet/mineral/uranium
 	canSmoothWith = list(/turf/closed/wall/mineral/uranium, /obj/structure/falsewall/uranium)
@@ -87,7 +90,7 @@
 /turf/closed/wall/mineral/plasma
 	name = "plasma wall"
 	desc = "A wall with plasma plating. This is definitely a bad idea."
-	icon = 'icons/turf/walls/plasma_wall.dmi'
+	icon = 'GainStation13/icons/turf/walls/plasma_wall.dmi'
 	icon_state = "plasma"
 	sheet_type = /obj/item/stack/sheet/mineral/plasma
 	thermal_conductivity = 0.04
@@ -126,7 +129,7 @@
 /turf/closed/wall/mineral/wood
 	name = "wooden wall"
 	desc = "A wall with wooden plating. Stiff."
-	icon = 'icons/turf/walls/wood_wall.dmi'
+	icon = 'GainStation13/icons/turf/walls/wood_wall.dmi'
 	icon_state = "wood"
 	sheet_type = /obj/item/stack/sheet/mineral/wood
 	hardness = 70
@@ -153,7 +156,7 @@
 /turf/closed/wall/mineral/iron
 	name = "rough metal wall"
 	desc = "A wall with rough metal plating."
-	icon = 'icons/turf/walls/iron_wall.dmi'
+	icon = 'GainStation13/icons/turf/walls/iron_wall.dmi'
 	icon_state = "iron"
 	sheet_type = /obj/item/stack/rods
 	canSmoothWith = list(/turf/closed/wall/mineral/iron, /obj/structure/falsewall/iron)
@@ -161,7 +164,7 @@
 /turf/closed/wall/mineral/snow
 	name = "packed snow wall"
 	desc = "A wall made of densely packed snow blocks."
-	icon = 'icons/turf/walls/snow_wall.dmi'
+	icon = 'GainStation13/icons/turf/walls/snow_wall.dmi'
 	icon_state = "snow"
 	hardness = 80
 	explosion_block = 0

code/game/turfs/simulated/wall/reinf_walls.dm

@@ -1,7 +1,7 @@
 /turf/closed/wall/r_wall
 	name = "reinforced wall"
 	desc = "A huge chunk of reinforced metal used to separate rooms."
-	icon = 'icons/turf/walls/reinforced_wall.dmi'
+	icon = 'GainStation13/icons/turf/walls/reinforced_wall.dmi' //GS13
 	icon_state = "r_wall"
 	opacity = 1
 	density = TRUE

code/game/turfs/simulated/walls.dm

@@ -3,7 +3,7 @@
 /turf/closed/wall
 	name = "wall"
 	desc = "A huge chunk of metal used to separate rooms."
-	icon = 'icons/turf/walls/wall.dmi'
+	icon = 'GainStation13/icons/turf/walls/wall.dmi' //GS13
 	icon_state = "wall"
 	explosion_block = 1
 	wave_explosion_block = EXPLOSION_BLOCK_WALL
@@ -31,15 +31,56 @@
 	var/sheet_amount = 2
 	var/girder_type = /obj/structure/girder
 
-	canSmoothWith = list(
-	/turf/closed/wall,
-	/turf/closed/wall/r_wall,
-	/obj/structure/falsewall,
-	/obj/structure/falsewall/brass,
-	/obj/structure/falsewall/reinforced,
-	/turf/closed/wall/rust,
-	/turf/closed/wall/r_wall/rust,
-	/turf/closed/wall/clockwork)
+	canSmoothWith = list( //GS13 edit
+		/turf/closed/wall,
+		/turf/closed/wall/r_wall,
+		/obj/structure/falsewall,
+		/obj/structure/falsewall/brass,
+		/obj/structure/falsewall/reinforced,
+		/turf/closed/wall/rust,
+		/turf/closed/wall/r_wall/rust,
+		/turf/closed/wall/clockwork,
+		/turf/closed/indestructible/riveted/,
+		/turf/closed/indestructible/riveted/uranium,
+		/obj/structure/window/fulltile,
+		/obj/structure/window/reinforced/fulltile,
+		/obj/structure/window/reinforced/tinted/fulltile,
+		/obj/structure/window/plasma/fulltile,
+		/obj/structure/window/plasma/reinforced/fulltile,
+		/obj/machinery/door,
+		/obj/machinery/door/airlock/,
+		/obj/machinery/door/airlock/mining,
+		/obj/machinery/door/airlock/mining/glass,
+		/obj/machinery/door/airlock/medical,
+		/obj/machinery/door/airlock/medical/glass,
+		/obj/machinery/door/airlock/public,
+		/obj/machinery/door/airlock/public/glass,
+		/obj/machinery/door/airlock/research,
+		/obj/machinery/door/airlock/research/glass,
+		/obj/machinery/door/airlock/maintenance,
+		/obj/machinery/door/airlock/maintenance/glass,
+		/obj/machinery/door/airlock/command/,
+		/obj/machinery/door/airlock/command/glass,
+		/obj/machinery/door/airlock/engineering,
+		/obj/machinery/door/airlock/engineering/glass,
+		/obj/machinery/door/airlock/engineering/abandoned,
+		/obj/machinery/door/airlock/security,
+		/obj/machinery/door/airlock/security/glass,
+		/obj/machinery/door/airlock/maintenance/abandoned,
+		/obj/machinery/door/poddoor/shutters/preopen,
+		/obj/machinery/door/poddoor/shutters,
+		/obj/machinery/door/window/eastright,
+		/obj/machinery/door/window/eastleft,
+		/obj/machinery/door/window/northleft,
+		/obj/machinery/door/window/northright,
+		/obj/machinery/door/airlock/external,
+		/obj/machinery/door/airlock,
+		/obj/machinery/door/airlock/hatch,
+		/obj/machinery/door/airlock/engineering/glass/critical,
+		/obj/machinery/door/airlock/atmos,
+		/obj/machinery/door/airlock/highsecurity,
+		/obj/machinery/door/airlock/centcom)
+
 	smooth = SMOOTH_TRUE
 
 	var/list/dent_decals