small tweaks

- fixed creambeasts and chocoslimes fighting
- added a gym to Xenoarch base
- assigned Fanatic Feeders to Syndicate faction, so the turrets don't do friendly fire
- small bits of GATO reflavoring
- ported Spider Legs (wings slot), gator taul tail and alt naga tail sprite from Virgo

code/_globalvars/lists/mobs.dm

@@ -59,11 +59,12 @@ GLOBAL_LIST_EMPTY(latejoiners) //CIT CHANGE - All latejoining people, for traito
 		var/mob/M = i
 		M.update_config_movespeed()
 
-// GS13: Import Fat Naga from VoreStation
+// GS13: Import Fat Naga, Alt Naga from VoreStation
 GLOBAL_LIST_INIT(noodle_taurs, list(
 		"Naga",
 		"Tentacle",
-		"Fat Naga"
+		"Fat Naga",
+		"Alt Naga",
 		))
 
 GLOBAL_LIST_INIT(paw_taurs, list(

code/controllers/subsystem/ticker.dm

@@ -583,9 +583,9 @@ SUBSYSTEM_DEF(ticker)
 	if(SSblackbox.first_death)
 		var/list/ded = SSblackbox.first_death
 		if(ded.len)
-			news_message += " NT Sanctioned Psykers picked up faint traces of someone near the station, allegedly having had died. Their name was: [ded["name"]], [ded["role"]], at [ded["area"]].[ded["last_words"] ? " Their last words were: \"[ded["last_words"]]\"" : ""]"
+			news_message += " GATO Sanctioned Psykers picked up faint traces of someone near the station, allegedly having had died. Their name was: [ded["name"]], [ded["role"]], at [ded["area"]].[ded["last_words"] ? " Their last words were: \"[ded["last_words"]]\"" : ""]"
 		else
-			news_message += " NT Sanctioned Psykers proudly confirm reports that nobody died this shift!"
+			news_message += " GATO Sanctioned Psykers proudly confirm reports that nobody died this shift!"
 
 	if(news_message)
 		send2otherserver(news_source, news_message,"News_Report")

code/datums/components/footstep.dm

@@ -97,8 +97,8 @@
 			var/mob/living/carbon/human/H = LM
 			var/feetCover = (H.wear_suit && (H.wear_suit.body_parts_covered & FEET)) || (H.w_uniform && (H.w_uniform.body_parts_covered & FEET))
 
-			// GS13: Import Fat Naga from VoreStation
-			if (H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle" || H.dna.features["taur"] == "Fat Naga") //are we a naga or tentacle taur creature
+			// GS13: Import Fat Naga and Alt Naga from VoreStation
+			if (H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle" || H.dna.features["taur"] == "Fat Naga" || H.dna.features["taur"] == "Alt Naga") //are we a naga or tentacle taur creature
 				playsound(T, 'sound/effects/footstep/crawl1.ogg', 15 * v)
 				return
 

code/game/machinery/newscaster.dm

@@ -862,7 +862,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 
 /obj/item/newspaper
 	name = "newspaper"
-	desc = "An issue of The Griffon, the newspaper circulating aboard Kin.Co Space Stations."
+	desc = "An issue of The Catpaw, the newspaper circulating aboard GATO's stations."
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "newspaper"
 	lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi'

code/game/objects/items/manuals.dm

@@ -302,7 +302,7 @@
 	name = "Space Law"
 	desc = "A set of Kin-Station guidelines for keeping law and order on their space stations."
 	icon_state = "bookSpaceLaw"
-	author = "Kin.Co PMC"
+	author = "GATO PMC"
 	title = "Space Law"
 	page_link = "Space_Law"
 

code/game/objects/items/storage/fancy.dm

@@ -209,8 +209,8 @@
 	spawn_type = /obj/item/clothing/mask/cigarette/dromedary
 
 /obj/item/storage/fancy/cigarettes/smokekins
-	name = "\improper smokekins packet"
-	desc = "Let the Radiance fill your lungs"
+	name = "\improper smoke-gatitos packet"
+	desc = "Strangely delicious aftertaste."
 	icon_state = "smokekins"
 	spawn_type = /obj/item/clothing/mask/cigarette/smokekins
 

code/game/objects/structures/showcase.dm

@@ -82,7 +82,7 @@
 
 /obj/structure/showcase/machinery/cloning_pod
 	name = "cloning pod exhibit"
-	desc = "Signs describe how cloning pods like these ensure that every Kin.Co employee can carry out their contracts in full, even in the unlikely event of their catastrophic death. Hopefully they aren't all made of cardboard, like this one."
+	desc = "Signs describe how cloning pods like these ensure that every GATO employee can carry out their contracts in full, even in the unlikely event of their catastrophic death. Hopefully they aren't all made of cardboard, like this one."
 	icon = 'icons/obj/machines/cloning.dmi'
 	icon_state = "pod_0"
 

code/game/objects/structures/signs/signs_plaques.dm

@@ -7,7 +7,7 @@
 
 /obj/structure/sign/plaques/atmos
 	name = "\improper CEO of the Millennia."
-	desc = "The CEO of GATO, adorned with a lack of expression and the heart for extended space colonization at the forefront of advanced light technology, at odds with Nanotrasen."
+	desc = "The CEO of GATO, adorned with a lack of expression and the heart for extended space colonization at the forefront of advanced nutrition technology."
 
 /obj/structure/sign/plaques/thunderdome
 	name = "Thunderdome Plaque"
@@ -15,7 +15,7 @@
 
 /obj/structure/sign/plaques/golden
 	name = "CEO of the Millennia"
-	desc = "The CEO of GATO, adorned with a lack of expression and the heart for extended space colonization at the forefront of advanced light technology, at odds with Nanotrasen."
+	desc = "The CEO of GATO, adorned with a lack of expression and the heart for extended space colonization at the forefront of advanced nutrition technology."
 	icon_state = "goldenplaque"
 
 /obj/structure/sign/plaques/golden/captain

code/modules/awaymissions/corpse.dm

@@ -683,8 +683,9 @@
 	job_description = "Fanatical degenerate"
 	short_desc = "You are a member of a niche branch of Syndicate with... strange goals."
 	flavour_text = "After months of construction and gathering equipment, your den is finished - a monument to gluttony, equipped with every tool to turn any sharp body into a quivering mound of lard..."
-	important_info = "Keep your den in one piece and away from curious eyes! YOU AREN'T ALLOWED TO CAPTURE / FATTEN UP PEOPLE WHO DON'T DO NON-CON OR DIDN'T AGREE TO IT!!"
+	important_info = "Keep your den in one piece and away from curious eyes! YOU AREN'T ALLOWED TO CAPTURE / FATTEN UP PEOPLE WHO DON'T DO NON-CON OR DIDN'T AGREE TO IT! Despite being able to leave the outpost, you do NOT have a permission to antag or grief."
 	outfit = /datum/outfit/feeders_den/fanatic
+	faction = ROLE_SYNDICATE
 	mirrorcanloadappearance = TRUE
 	assignedrole = "Space Agent"
 	icon = 'icons/obj/machines/sleeper.dmi'
@@ -701,11 +702,14 @@
 	gloves = /obj/item/clothing/gloves/combat
 	ears = /obj/item/radio/headset/syndicate/alt
 	back = /obj/item/storage/backpack
-	r_hand = /obj/item/melee/transforming/energy/sword/saber
+	r_hand = /obj/item/flashlight
 	r_pocket = /obj/item/gun/ballistic/automatic/pistol
 	id = /obj/item/card/id/syndicate/anyone
 	implants = list(/obj/item/implant/weapons_auth)
 
+/datum/outfit/feeders_den/fanatic/post_equip(mob/living/carbon/human/H)
+	H.faction |= ROLE_SYNDICATE
+
 /datum/outfit/feeders_den/fanatic/Destroy()
 	new/obj/structure/fluff/empty_sleeper/syndicate(get_turf(src))
 	..()
@@ -742,10 +746,6 @@
 	new/obj/structure/fluff/empty_sleeper/syndicate(get_turf(src))
 	..()
 
-/obj/effect/mob_spawn/human/feeders_den/victim/startfat(mob/living/carbon/human/new_spawn)
-	new_spawn.fatness = 300
-	return ..()
-
 /obj/effect/mob_spawn/human/feeders_den/victim/special(mob/living/carbon/human/new_spawn)
 	ADD_TRAIT(new_spawn,TRAIT_EXEMPT_HEALTH_EVENTS,GHOSTROLE_TRAIT)
 

code/modules/awaymissions/mission_code/snowdin.dm

@@ -597,7 +597,7 @@
 	faction = ROLE_SYNDICATE
 	outfit = /datum/outfit/snowsyndie
 	short_desc = "You are a syndicate operative recently awoken from cryostasis in an underground outpost."
-	flavour_text = "You are a syndicate operative recently awoken from cryostasis in an underground outpost. Monitor Nanotrasen communications and record information. All intruders should be \
+	flavour_text = "You are a syndicate operative recently awoken from cryostasis in an underground outpost. Monitor GATO communications and record information. All intruders should be \
 	disposed of swiftly to assure no gathered information is stolen or lost. Try not to wander too far from the outpost as the caves can be a deadly place even for a trained operative such as yourself."
 
 /datum/outfit/snowsyndie

code/modules/events/major_dust.dm

@@ -10,7 +10,7 @@
 	var/reason = pick(
 		"The station is passing through a debris cloud, expect minor damage \
 		to external fittings and fixtures.",
-		"Nanotrasen Superweapons Division is testing a new prototype \
+		"GATO Superweapons Division is testing a new prototype \
 		[pick("field","projection","nova","super-colliding","reactive")] \
 		[pick("cannon","artillery","tank","cruiser","\[REDACTED\]")], \
 		some mild debris is expected.",
@@ -25,4 +25,4 @@
 				var/obj/item/paper/P = new(C.loc)
 				P.name = "Collision Alert"
 				P.info = "[pick(reason)]"
-				P.update_icon()
+				P.update_icon()

code/modules/mob/dead/new_player/sprite_accessories/wings.dm

@@ -71,7 +71,6 @@
 /datum/sprite_accessory/deco_wings/punished
 	name = "Burnt Off"
 	icon_state = "punished"
-	locked = TRUE
 
 /datum/sprite_accessory/deco_wings/firewatch
 	name = "Firewatch"
@@ -123,4 +122,9 @@
 
 /datum/sprite_accessory/deco_wings/none
 	name = "None"
-	icon_state = "none"
+	icon_state = "none"
+
+//virgo port
+/datum/sprite_accessory/deco_wings/spider_legs //Not really /WINGS/ but they protrude from the back, kinda. Might as well have them here.
+	name = "Spider"
+	icon_state = "spider"

code/modules/research/techweb/_techweb.dm

@@ -53,7 +53,7 @@
 
 /datum/techweb/science	//Global science techweb for RND consoles.
 	id = "SCIENCE"
-	organization = "Nanotrasen"
+	organization = "GATO"
 
 /datum/techweb/Destroy()
 	researched_nodes = null

code/modules/ruins/lavaland_ruin_code.dm

@@ -118,7 +118,7 @@
 	icon = 'icons/obj/machines/sleeper.dmi'
 	icon_state = "sleeper_s"
 	short_desc = "You are a syndicate agent, employed in a top secret research facility developing biological weapons plants and toys."
-	flavour_text = "Fortunately, Nanotrasen's activity in this sector of space is minimal. Continue your research as best you can, and try to keep a low profile from both Nanotrasen and GATO."
+	flavour_text = "Fortunately, GATO's activity in this sector of space is minimal. Continue your research as best you can, and try to keep a low profile from both Nanotrasen and GATO."
 	important_info = "The base is rigged with explosives, DO NOT leave the base or let it fall into enemy hands!" //Changed 'abandon it' to 'leave the base', no more loopholes please, you know who you are.
 	outfit = /datum/outfit/lavaland_syndicate
 	assignedrole = "Lavaland Syndicate"
@@ -148,7 +148,7 @@
 	name = "Syndicate Comms Agent"
 	job_description = "Off-station Syndicate Comms Agent"
 	short_desc = "You are a syndicate comms agent, employed in a top secret research facility developing biological weapons."
-	flavour_text = "Fortunately, Nanotrasen's activity in this sector of space is minimal. Monitor enemy activity as best you can, and try to keep a low profile. Use the communication equipment to provide support to any field agents, and sow disinformation to throw Nanotrasen or GATO off your trail. Do not let the base fall into enemy hands!"
+	flavour_text = "Fortunately, GATO's activity in this sector of space is minimal. Monitor enemy activity as best you can, and try to keep a low profile. Use the communication equipment to provide support to any field agents, and sow disinformation to throw Nanotrasen or GATO off your trail. Do not let the base fall into enemy hands!"
 	important_info = "The base is rigged with explosives, DO NOT leave the base or let it fall into enemy hands!" //Changed 'abandon it' to 'leave the base', no more loopholes please, you know who you are.
 	outfit = /datum/outfit/lavaland_syndicate/comms
 	mirrorcanloadappearance = TRUE