Label GS13 changes

Since commit 5084020 on Jan 30, 2023

code/modules/mining/lavaland/necropolis_chests.dm

@@ -11,7 +11,7 @@
 	desc = "It's watching you suspiciously."
 
 /obj/structure/closet/crate/necropolis/tendril/PopulateContents()
-	var/loot = rand(1,34)
+	var/loot = rand(1,33)
 	switch(loot)
 		if(1)
 			new /obj/item/shared_storage/red(src)
@@ -65,7 +65,7 @@
 			new /obj/item/circuitboard/machine/plantgenes/vault
 		if(23)
 			new /obj/item/grenade/clusterbuster/soap(src)
-			new /obj/item/grenade/chem_grenade/glitter/pink(src)
+			new /obj/item/grenade/chem_grenade/glitter/pink(src) // GS13
 			new /obj/item/grenade/chem_grenade/glitter/blue(src)
 		if(24)
 			new /obj/item/reagent_containers/food/drinks/bottle/holywater/hell(src)
@@ -79,8 +79,9 @@
 			new /obj/item/bedsheet/cult(src)
 		if(28)
 			new /obj/item/clothing/neck/necklace/memento_mori(src)
+		// GS13
 		if(29)
-			new /obj/item/book/granter/spell/fattening(src) //GS13 STUFF
+			new /obj/item/book/granter/spell/fattening(src)
 			new /obj/item/grenade/chem_grenade/lipoifier_weak(src)
 		if(30)
 			new /obj/item/book/granter/spell/fattening/transfer(src)
@@ -91,8 +92,6 @@
 			new /obj/item/gun/energy/fatoray/cannon(src)
 		if(33)
 			new /obj/item/gun/magic/wand/food(src)
-//		if(29)
-//			new /obj/item/clothing/gloves/gauntlets(src)
 
 //KA modkit design discs
 /obj/item/disk/design_disk/modkit_disc
@@ -190,6 +189,7 @@
 		to_chat(itemUser, failText)
 		return
 	if(do_after(itemUser, 30, target = itemUser))
+	 	// GS13: "sentient creatures"
 		itemUser.say("I will remember that I remain a member of society, with special obligations to all my fellow sentient creatures, those sound of mind and body as well as the infirm.", forced = "hippocratic oath")
 	else
 		to_chat(itemUser, failText)

code/modules/mining/lavaland/ruins/gym.dm

@@ -7,9 +7,7 @@
 	layer = WALL_OBJ_LAYER
 	var/list/hit_sounds = list('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg',\
 	'sound/weapons/punch1.ogg', 'sound/weapons/punch2.ogg', 'sound/weapons/punch3.ogg', 'sound/weapons/punch4.ogg')
-	//GS13 EDIT
-	///How much fatness is lost when punching?
-	var/loss_per_punch = 2.5
+	var/loss_per_punch = 2.5 // GS13
 
 /obj/structure/punching_bag/attack_hand(mob/user as mob)
 	. = ..()
@@ -22,7 +20,7 @@
 		SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "exercise", /datum/mood_event/exercise)
 		L.apply_status_effect(STATUS_EFFECT_EXERCISED)
 	
-	//GS13 EDIT
+	//GS13
 	var/mob/living/carbon/puncher = user
 	if(puncher)
 		puncher.adjust_fatness(-loss_per_punch, FATTENING_TYPE_WEIGHT_LOSS)
@@ -33,8 +31,7 @@
 	density = TRUE
 	anchored = TRUE
 	var/icon_state_inuse
-	//GS13 EDIT
-	///How much fatness is lost when using the machine?
+	//GS13
 	var/loss_per_use = 30
 
 /obj/structure/weightmachine/proc/AnimateMachine(mob/living/user)
@@ -66,7 +63,7 @@
 		to_chat(user, finishmessage)
 		user.apply_status_effect(STATUS_EFFECT_EXERCISED)
 		
-		//GS13 Edit
+		//GS13
 		var/mob/living/carbon/lifter = user
 		if(lifter)
 			lifter.adjust_fatness(-loss_per_use, FATTENING_TYPE_WEIGHT_LOSS)

code/modules/mining/machine_processing.dm

@@ -82,7 +82,11 @@
 /obj/machinery/mineral/processing_unit/Initialize()
 	. = ..()
 	proximity_monitor = new(src, 1)
-	AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_CALORITE, MAT_TITANIUM, MAT_BLUESPACE), INFINITY, TRUE, /obj/item/stack)
+	// GS13 calorite
+	AddComponent(/datum/component/material_container, list(
+			MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA,
+			MAT_URANIUM, MAT_BANANIUM, MAT_CALORITE, MAT_TITANIUM, MAT_BLUESPACE),
+		INFINITY, TRUE, /obj/item/stack)
 	stored_research = new /datum/techweb/specialized/autounlocking/smelter
 
 /obj/machinery/mineral/processing_unit/Destroy()

code/modules/mining/machine_redemption.dm

@@ -17,7 +17,19 @@
 	var/ore_pickup_rate = 15
 	var/sheet_per_ore = 1
 	var/point_upgrade = 1
-	var/list/ore_values = list(MAT_GLASS = 1, MAT_METAL = 1, MAT_PLASMA = 15, MAT_SILVER = 16, MAT_GOLD = 18, MAT_TITANIUM = 30, MAT_URANIUM = 30, MAT_DIAMOND = 50, MAT_BLUESPACE = 50, MAT_BANANIUM = 60, MAT_CALORITE = 40)
+	// GS13 calorite
+	var/list/ore_values = list(
+		MAT_GLASS = 1,
+		MAT_METAL = 1,
+		MAT_PLASMA = 15,
+		MAT_SILVER = 16,
+		MAT_GOLD = 18,
+		MAT_TITANIUM = 30,
+		MAT_URANIUM = 30,
+		MAT_DIAMOND = 50,
+		MAT_BLUESPACE = 50,
+		MAT_BANANIUM = 60,
+		MAT_CALORITE = 40)
 	var/message_sent = FALSE
 	var/list/ore_buffer = list()
 	var/datum/techweb/stored_research

code/modules/mining/machine_silo.dm

@@ -15,14 +15,11 @@ GLOBAL_LIST_EMPTY(silo_access_logs)
 
 /obj/machinery/ore_silo/Initialize(mapload)
 	. = ..()
-	AddComponent(/datum/component/material_container,
-		list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_CALORITE, MAT_TITANIUM, MAT_BLUESPACE, MAT_PLASTIC),
-		INFINITY,
-		FALSE,
-		/obj/item/stack,
-		null,
-		null,
-		TRUE)
+	// GS13 calorite
+	AddComponent(/datum/component/material_container, list(
+			MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA,
+			MAT_URANIUM, MAT_BANANIUM, MAT_CALORITE, MAT_TITANIUM, MAT_BLUESPACE, MAT_PLASTIC),
+		INFINITY, FALSE, /obj/item/stack, null, null, TRUE)
 	if (!GLOB.ore_silo_default && mapload && is_station_level(z))
 		GLOB.ore_silo_default = src
 

code/modules/mining/minebot.dm

@@ -28,6 +28,7 @@
 	attack_sound = 'sound/weapons/circsawhit.ogg'
 	sentience_type = SENTIENCE_MINEBOT
 	speak_emote = list("states")
+	// GS13 calorite
 	wanted_objects = list(/obj/item/stack/ore/diamond, /obj/item/stack/ore/gold, /obj/item/stack/ore/silver,
 						  /obj/item/stack/ore/plasma, /obj/item/stack/ore/uranium, /obj/item/stack/ore/iron,
 						  /obj/item/stack/ore/bananium, /obj/item/stack/ore/calorite, /obj/item/stack/ore/titanium)

code/modules/mining/mint.dm

@@ -15,7 +15,11 @@
 
 /obj/machinery/mineral/mint/Initialize()
 	. = ..()
-	AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_URANIUM, MAT_DIAMOND, MAT_BANANIUM, MAT_CALORITE), MINERAL_MATERIAL_AMOUNT * 50, FALSE, /obj/item/stack)
+	// GS13 calorite
+	AddComponent(/datum/component/material_container, list(
+			MAT_METAL, MAT_PLASMA, MAT_SILVER, MAT_GOLD,
+			MAT_URANIUM, MAT_DIAMOND, MAT_BANANIUM, MAT_CALORITE),
+		MINERAL_MATERIAL_AMOUNT * 50, FALSE, /obj/item/stack)
 
 /obj/machinery/mineral/mint/process()
 	var/turf/T = get_step(src, input_dir)