Label GS13 changes

Since commit 5084020 on Jan 30, 2023

code/game/machinery/iv_drip.dm

@@ -15,10 +15,7 @@
 									/obj/item/reagent_containers/food,
 									/obj/item/reagent_containers/glass,
 									/obj/item/reagent_containers/chem_pack))
-	//GS13 EDIT
-	///What kind of attachment point is used?
-	var/attachment_point = "needle"
-	//GS13 EDIT END
+	var/attachment_point = "needle" // GS13
 	
 /obj/machinery/iv_drip/Initialize(mapload)
 	. = ..()
@@ -124,7 +121,7 @@
 		return PROCESS_KILL
 
 	if(!(get_dist(src, attached) <= 1 && isturf(attached.loc)))
-		to_chat(attached, "<span class='userdanger'>[src] [attachment_point] is ripped out of you!</span>")
+		to_chat(attached, "<span class='userdanger'>[src] [attachment_point] is ripped out of you!</span>") // GS13
 		attached.apply_damage(3, BRUTE, pick(BODY_ZONE_R_ARM, BODY_ZONE_L_ARM))
 		attached = null
 		update_icon()

code/game/machinery/recycler.dm

@@ -18,7 +18,11 @@
 	var/item_recycle_sound = 'sound/items/welder.ogg'
 
 /obj/machinery/recycler/Initialize()
-	AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_URANIUM, MAT_BANANIUM, MAT_CALORITE, MAT_TITANIUM, MAT_BLUESPACE, MAT_PLASTIC), INFINITY, FALSE, null, null, null, TRUE)
+	// GS13 calorite
+	AddComponent(/datum/component/material_container, list(
+			MAT_METAL, MAT_GLASS, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_DIAMOND,
+			MAT_URANIUM, MAT_BANANIUM, MAT_CALORITE, MAT_TITANIUM, MAT_BLUESPACE, MAT_PLASTIC),
+		INFINITY, FALSE, null, null, null, TRUE)
 	AddComponent(/datum/component/butchering, 1, amount_produced,amount_produced/5)
 	. = ..()
 	update_icon()

code/game/objects/effects/spawners/lootdrop.dm

@@ -74,7 +74,7 @@
 			/obj/item/cigbutt = 1,
 			/obj/item/trash/cheesie = 1,
 			/obj/item/trash/candy = 1,
-			/obj/item/trash/fatoray_scrap1 = 1,
+			/obj/item/trash/fatoray_scrap1 = 1, // GS13
 			/obj/item/trash/fatoray_scrap2 = 1,
 			/obj/item/trash/chips = 1,
 			/obj/item/reagent_containers/food/snacks/deadmouse = 1,

code/game/objects/items/stacks/tiles/tile_types.dm

@@ -218,7 +218,7 @@
 /obj/item/stack/tile/carpet/royalblue/fifty
 	amount = 50
 
-/obj/item/stack/tile/carpet/gato/fifty
+/obj/item/stack/tile/carpet/gato/fifty // GS13
 	amount = 50
 
 /obj/item/stack/tile/fakespace

code/game/objects/items/stunbaton.dm

@@ -186,9 +186,10 @@
 			return FALSE
 		stunpwr *= round(stuncharge/hitcost, 0.1)
 
-
-	//L.Knockdown(stunpwr) GS13 change, makes stunbatons no longer oneshot people -Eye
-	L.adjustStaminaLoss(stunpwr*0.5, affected_zone = (istype(user) ? user.zone_selected : BODY_ZONE_CHEST))//CIT CHANGE - makes stunbatons deal extra staminaloss. Todo: make this also deal pain when pain gets implemented.
+	// GS13: Make stunbatons no longer oneshot people -Eye
+	//L.Knockdown(stunpwr)
+	// CIT CHANGE - make stunbatons deal extra stamina loss. TODO: make this also deal pain when pain gets implemented.
+	L.adjustStaminaLoss(stunpwr*0.5, affected_zone = (istype(user) ? user.zone_selected : BODY_ZONE_CHEST))
 	L.apply_effect(EFFECT_STUTTER, stunforce)
 	SEND_SIGNAL(L, COMSIG_LIVING_MINOR_SHOCK)
 	if(user)

code/game/turfs/open.dm

@@ -205,20 +205,19 @@
 	heavyfootstep = FOOTSTEP_GENERIC_HEAVY
 
 
-/turf/open/indestructible/chocolate
+/turf/open/indestructible/chocolate // GS13
 	name = "chocolate floor"
 	desc = "A rather tasty floor, hopefully it does not ruin your shoes."
 	icon = 'Gainstation13/icons/turf/floor_candy.dmi'
 	icon_state = "choclit_2"
 
-
-/turf/open/indestructible/bubblegum
+/turf/open/indestructible/bubblegum // GS13
 	name = "bubblegum floor"
 	desc = "A rather tasty floor, hopefully it does not ruin your shoes."
 	icon = 'Gainstation13/icons/turf/floor_candy.dmi'
 	icon_state = "floor_pinkgum"
 
-/turf/open/candyfloor
+/turf/open/candyfloor // GS13
 	name = "candy grass"
 	desc = "This weird grass smells of cinnamon and liquorice."
 	icon = 'Gainstation13/icons/turf/floor_candy.dmi'

code/game/turfs/simulated/minerals.dm

@@ -131,9 +131,19 @@
 	T.ChangeTurf(type)
 
 /turf/closed/mineral/random
-	var/list/mineralSpawnChanceList = list(/turf/closed/mineral/uranium = 5, /turf/closed/mineral/diamond = 1, /turf/closed/mineral/gold = 10,
-		/turf/closed/mineral/silver = 12, /turf/closed/mineral/plasma = 20, /turf/closed/mineral/iron = 40, /turf/closed/mineral/titanium = 11,
-		/turf/closed/mineral/gibtonite = 4, /turf/open/floor/plating/asteroid/airless/cave = 2, /turf/closed/mineral/bscrystal = 1, /turf/closed/mineral/calorite = 1)
+	// GS13 calorite
+	var/list/mineralSpawnChanceList = list(
+		/turf/closed/mineral/uranium = 5,
+		/turf/closed/mineral/diamond = 1,
+		/turf/closed/mineral/gold = 10,
+		/turf/closed/mineral/silver = 12,
+		/turf/closed/mineral/plasma = 20,
+		/turf/closed/mineral/iron = 40,
+		/turf/closed/mineral/titanium = 11,
+		/turf/closed/mineral/gibtonite = 4,
+		/turf/open/floor/plating/asteroid/airless/cave = 2,
+		/turf/closed/mineral/bscrystal = 1,
+		/turf/closed/mineral/calorite = 1)
 		//Currently, Adamantine won't spawn as it has no uses. -Durandan
 	var/mineralChance = 13
 	var/display_icon_state = "rock"
@@ -172,9 +182,17 @@
 	baseturfs = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
 	initial_gas_mix = LAVALAND_DEFAULT_ATMOS
 	defer_change = 1
+	// GS13 calorite
 	mineralSpawnChanceList = list(
-		/turf/closed/mineral/uranium/volcanic = 35, /turf/closed/mineral/diamond/volcanic = 30, /turf/closed/mineral/calorite = 30, /turf/closed/mineral/gold/volcanic = 45, /turf/closed/mineral/titanium/volcanic = 45,
-		/turf/closed/mineral/silver/volcanic = 50, /turf/closed/mineral/plasma/volcanic = 50, /turf/closed/mineral/bscrystal/volcanic = 20)
+		/turf/closed/mineral/uranium/volcanic = 35,
+		/turf/closed/mineral/diamond/volcanic = 30,
+		/turf/closed/mineral/calorite = 30,
+		/turf/closed/mineral/gold/volcanic = 45,
+		/turf/closed/mineral/titanium/volcanic = 45,
+		/turf/closed/mineral/silver/volcanic = 50,
+		/turf/closed/mineral/plasma/volcanic = 50,
+		/turf/closed/mineral/bscrystal/volcanic = 20
+	)
 
 
 

code/game/turfs/simulated/water.dm

@@ -13,9 +13,7 @@
 	clawfootstep = FOOTSTEP_WATER
 	heavyfootstep = FOOTSTEP_WATER
 
-
-
-/turf/open/chocolateriver
+/turf/open/chocolateriver // GS13
 	gender = PLURAL
 	name = "liquid chocolate"
 	desc = "This is probably used for some kind of huge fountain."
@@ -28,4 +26,4 @@
 	footstep = FOOTSTEP_WATER
 	barefootstep = FOOTSTEP_WATER
 	clawfootstep = FOOTSTEP_WATER
-	heavyfootstep = FOOTSTEP_WATER
+	heavyfootstep = FOOTSTEP_WATER