GAS carry build late game (#4957)

* agro-grab * noslip + tackle resist * movespeed raise * eyes slot + offset * agrograb's qol spans * faster scythes + remove comment * no glasses actually + exceptions * exceptions + icon name fix * [Drish] fix huds nabber * scythes_stop_standing * aaa * aaa2 * lategaming * aaa2.1 * aaa1.1 * stash valid * tabulation missed * Update tff_modular/modules/nabbers/code/_nabbers.dm Co-authored-by: SuperDrish <[email protected]> * Update tff_modular/modules/nabbers/code/_nabbers.dm Co-authored-by: SuperDrish <[email protected]> * Update tff_modular/modules/nabbers/code/_nabbers.dm Co-authored-by: SuperDrish <[email protected]> * Update tff_modular/modules/nabbers/code/_nabbers.dm Co-authored-by: SuperDrish <[email protected]> * Update tff_modular/modules/nabbers/code/_nabbers.dm Co-authored-by: SuperDrish <[email protected]> * Update tff_modular/modules/nabbers/code/_nabbers.dm Co-authored-by: SuperDrish <[email protected]> * Update tff_modular/modules/nabbers/code/nabber_bolaimmunity.dm Co-authored-by: SuperDrish <[email protected]> * Update tff_modular/modules/nabbers/code/nabber_language.dm Co-authored-by: SuperDrish <[email protected]> * Update tff_modular/modules/nabbers/code/nabber_language.dm Co-authored-by: SuperDrish <[email protected]> * eyes fix * qol, fix, blacklist update * language fix --------- Co-authored-by: SuperDrish <[email protected]>
Fluffy-Frontier · Dec 19, 2024 · d80d064 · d80d064
1 parent d7a4116
commit d80d064
Show file tree

Hide file tree

Showing 16 changed files with 571 additions and 32 deletions.
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
@@ -38,6 +38,7 @@
 	icon_state = "healthhud"
 	clothing_traits = list(TRAIT_MEDICAL_HUD)
 	glass_colour_type = /datum/client_colour/glass_colour/lightblue
+	species_exception = list(/datum/species/nabber) // FF ADDITION
 
 /obj/item/clothing/glasses/hud/medsechud
 	name = "health scanner security HUD"
@@ -57,6 +58,7 @@
 	glass_colour_type = /datum/client_colour/glass_colour/lightgreen
 	actions_types = list(/datum/action/item_action/toggle_nv)
 	forced_glass_color = TRUE
+	species_exception = list() // FF ADDITION
 
 /obj/item/clothing/glasses/hud/health/night/update_icon_state()
 	. = ..()
@@ -82,6 +84,7 @@
 	flags_cover = GLASSESCOVERSEYES
 	tint = 1
 	glass_colour_type = /datum/client_colour/glass_colour/blue
+	species_exception = list() // FF ADDITION
 
 /obj/item/clothing/glasses/hud/health/sunglasses/Initialize(mapload)
 	. = ..()
@@ -98,6 +101,7 @@
 	icon_state = "diagnostichud"
 	clothing_traits = list(TRAIT_DIAGNOSTIC_HUD)
 	glass_colour_type = /datum/client_colour/glass_colour/lightorange
+	species_exception = list(/datum/species/nabber) // FF ADDITION
 
 /obj/item/clothing/glasses/hud/diagnostic/night
 	name = "night vision diagnostic HUD"
@@ -111,6 +115,7 @@
 	glass_colour_type = /datum/client_colour/glass_colour/lightyellow
 	actions_types = list(/datum/action/item_action/toggle_nv)
 	forced_glass_color = TRUE
+	species_exception = list() // FF ADDITION
 
 /obj/item/clothing/glasses/hud/diagnostic/night/update_icon_state()
 	. = ..()
@@ -124,6 +129,7 @@
 	flash_protect = FLASH_PROTECTION_FLASH
 	flags_cover = GLASSESCOVERSEYES
 	tint = 1
+	species_exception = list() // FF ADDITION
 
 /obj/item/clothing/glasses/hud/diagnostic/sunglasses/Initialize(mapload)
 	. = ..()
@@ -140,19 +146,22 @@
 	icon_state = "securityhud"
 	clothing_traits = list(TRAIT_SECURITY_HUD)
 	glass_colour_type = /datum/client_colour/glass_colour/red
+	species_exception = list(/datum/species/nabber) // FF ADDITION
 
 /obj/item/clothing/glasses/hud/security/chameleon
 	name = "chameleon security HUD"
 	desc = "A stolen security HUD integrated with Syndicate chameleon technology. Provides flash protection."
 	flash_protect = FLASH_PROTECTION_FLASH
 	actions_types = list(/datum/action/item_action/chameleon/change/glasses/no_preset)
+	species_exception = list() // FF ADDITION
 
 /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch
 	name = "eyepatch HUD"
 	desc = "The cooler looking cousin of HUDSunglasses."
 	icon_state = "hudpatch"
 	base_icon_state = "hudpatch"
 	actions_types = list(/datum/action/item_action/flip)
+	species_exception = list() // FF ADDITION
 
 /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch/attack_self(mob/user, modifiers)
 	. = ..()
@@ -167,6 +176,7 @@
 	flags_cover = GLASSESCOVERSEYES
 	tint = 1
 	glass_colour_type = /datum/client_colour/glass_colour/darkred
+	species_exception = list() // FF ADDITION
 
 /obj/item/clothing/glasses/hud/security/sunglasses/Initialize(mapload)
 	. = ..()
@@ -188,6 +198,7 @@
 	glass_colour_type = /datum/client_colour/glass_colour/lightred
 	actions_types = list(/datum/action/item_action/toggle_nv)
 	forced_glass_color = TRUE
+	species_exception = list() // FF ADDITION
 
 /obj/item/clothing/glasses/hud/security/night/update_icon_state()
 	. = ..()
@@ -206,13 +217,15 @@
 	attack_verb_simple = list("slice")
 	hitsound = 'sound/items/weapons/bladeslice.ogg'
 	sharpness = SHARP_EDGED
+	species_exception = list() // FF ADDITION
 
 /obj/item/clothing/glasses/hud/security/sunglasses/gars/giga
 	name = "giga HUD gar glasses"
 	desc = "GIGA GAR glasses with a HUD."
 	icon_state = "gigagar_sec"
 	force = 12
 	throwforce = 12
+	species_exception = list() // FF ADDITION
 
 /obj/item/clothing/glasses/hud/toggle
 	name = "Toggle HUD"
@@ -251,6 +264,7 @@
 	color_cutoffs = list(25, 8, 5)
 	glass_colour_type = /datum/client_colour/glass_colour/red
 	clothing_traits = list(TRAIT_SECURITY_HUD)
+	species_exception = list() // FF ADDITION
 
 /obj/item/clothing/glasses/hud/toggle/thermal/attack_self(mob/user)
 	..()

diff --git a/code/modules/mob/living/living_say.dm b/code/modules/mob/living/living_say.dm
@@ -278,6 +278,18 @@ GLOBAL_LIST_INIT(message_modes_stat_limits, list(
 	if((SEND_SIGNAL(src, COMSIG_MOVABLE_PRE_HEAR, args) & COMSIG_MOVABLE_CANCEL_HEARING) || !GET_CLIENT(src))
 		return FALSE
 
+// FLUFFY EDIT START Converts scrambled nabber's msg into emote for people
+	if(ispath(message_language, /datum/language/nabber) && speaker != src)
+		var/gbs_translation_check = translate_language(speaker, message_language, raw_message, spans, message_mods)
+		if(raw_message != gbs_translation_check)
+			message_mods[MODE_CUSTOM_SAY_EMOTE] = gbs_translation_check
+			message_mods[MODE_CUSTOM_SAY_ERASE_INPUT] = TRUE
+
+	if(ispath(message_language, /datum/language/nabber) && isnabber(src))
+		message_mods[MODE_CUSTOM_SAY_EMOTE] = null
+		message_mods[MODE_CUSTOM_SAY_ERASE_INPUT] = FALSE
+	// FLUFFY EDIT END
+
 	var/deaf_message
 	var/deaf_type
 

diff --git a/code/modules/research/techweb/nodes/cyborg_nodes.dm b/code/modules/research/techweb/nodes/cyborg_nodes.dm
@@ -149,6 +149,7 @@
 		"implanter",
 		"locator",
 		"c38_trac",
+		"implant_gasspeech",
 	)
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS)
 	announce_channels = list(RADIO_CHANNEL_SECURITY, RADIO_CHANNEL_MEDICAL)

diff --git a/modular_nova/modules/huds/code/glasses/HUD_Glasses.dm b/modular_nova/modules/huds/code/glasses/HUD_Glasses.dm
@@ -4,6 +4,7 @@
 	icon = 'modular_nova/modules/huds/icons/huds.dmi'
 	icon_state = "glasses_healthhud"
 	worn_icon = 'modular_nova/modules/huds/icons/hudeyes.dmi'
+	species_exception = list() // FF ADDITION
 
 /obj/item/clothing/glasses/hud/health/prescription/Initialize(mapload)
 	clothing_traits += list(TRAIT_NEARSIGHTED_CORRECTED)
@@ -15,6 +16,7 @@
 	icon = 'modular_nova/modules/huds/icons/huds.dmi'
 	icon_state = "glasses_diagnostichud"
 	worn_icon = 'modular_nova/modules/huds/icons/hudeyes.dmi'
+	species_exception = list() // FF ADDITION
 
 /obj/item/clothing/glasses/hud/diagnostic/prescription/Initialize(mapload)
 	clothing_traits += list(TRAIT_NEARSIGHTED_CORRECTED)
@@ -26,6 +28,7 @@
 	icon = 'modular_nova/modules/huds/icons/huds.dmi'
 	icon_state = "glasses_securityhud"
 	worn_icon = 'modular_nova/modules/huds/icons/hudeyes.dmi'
+	species_exception = list() // FF ADDITION
 
 /obj/item/clothing/glasses/hud/security/prescription/Initialize(mapload)
 	clothing_traits += list(TRAIT_NEARSIGHTED_CORRECTED)
@@ -51,6 +54,7 @@
 /obj/item/clothing/glasses/meson/prescription
 	name = "prescription optical meson scanner"
 	desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting conditions. This one has prescription lens fitted in."
+	species_exception = list() // FF ADDITION
 
 /obj/item/clothing/glasses/meson/prescription/Initialize(mapload)
 	clothing_traits += list(TRAIT_NEARSIGHTED_CORRECTED)

diff --git a/modular_nova/modules/meson_scouter/code/meson_scouter.dm b/modular_nova/modules/meson_scouter/code/meson_scouter.dm
@@ -1,4 +1,5 @@
 /obj/item/clothing/glasses/meson
+	species_exception = list(/datum/species/nabber) // FF ADDITION
 	uses_advanced_reskins = TRUE
 	unique_reskin = list(
 		"Meson Glasses" = list(
@@ -11,12 +12,12 @@
 			RESKIN_ICON = 'modular_nova/modules/meson_scouter/icons/meson_scouter.dmi',
 			RESKIN_ICON_STATE = "meson_scouter",
 			RESKIN_WORN_ICON = 'modular_nova/modules/meson_scouter/icons/meson-scouter_mob.dmi',
-			RESKIN_WORN_ICON_STATE = "meson_scouter"
 		),
 	)
 
 /obj/item/clothing/glasses/meson/night/Initialize(mapload)
 	. = ..()
+	species_exception = list() // FF ADDITION
 	unique_reskin -= list(
 		"Meson Glasses" = list(
 			RESKIN_ICON = 'icons/obj/clothing/glasses.dmi',
@@ -34,6 +35,7 @@
 
 /obj/item/clothing/glasses/meson/gar/Initialize(mapload)
 	. = ..()
+	species_exception = list() // FF ADDITION
 	unique_reskin -= list(
 		"Meson Glasses" = list(
 			RESKIN_ICON = 'icons/obj/clothing/glasses.dmi',
@@ -51,6 +53,7 @@
 
 /obj/item/clothing/glasses/meson/prescription/Initialize(mapload)
 	. = ..()
+	species_exception = list() // FF ADDITION
 	unique_reskin -= list(
 		"Meson Glasses" = list(
 			RESKIN_ICON = 'icons/obj/clothing/glasses.dmi',
@@ -67,6 +70,7 @@
 	)
 
 /obj/item/clothing/glasses/meson/engine
+	species_exception = list(/datum/species/nabber) // FF ADDITION
 	uses_advanced_reskins = TRUE
 	unique_reskin = list(
 		"Engine Glasses" = list(
@@ -83,6 +87,7 @@
 
 /obj/item/clothing/glasses/meson/engine/tray/Initialize(mapload)
 	. = ..()
+	species_exception = list() // FF ADDITION
 	unique_reskin -= list(
 		"Engine Glasses" = list(
 			RESKIN_ICON = 'icons/obj/clothing/glasses.dmi',
@@ -98,6 +103,7 @@
 
 /obj/item/clothing/glasses/meson/engine/shuttle/Initialize(mapload)
 	. = ..()
+	species_exception = list() // FF ADDITION
 	unique_reskin -= list(
 		"Engine Glasses" = list(
 			RESKIN_ICON = 'icons/obj/clothing/glasses.dmi',
@@ -113,6 +119,7 @@
 
 /obj/item/clothing/glasses/meson/engine/atmos_imaging/Initialize(mapload)
 	. = ..()
+	species_exception = list() // FF ADDITION
 	unique_reskin -= list(
 		"Engine Glasses" = list(
 			RESKIN_ICON = 'icons/obj/clothing/glasses.dmi',
@@ -128,6 +135,7 @@
 
 /obj/item/clothing/glasses/meson/engine/prescription/Initialize(mapload)
 	. = ..()
+	species_exception = list() // FF ADDITION
 	unique_reskin -= list(
 		"Engine Glasses" = list(
 			RESKIN_ICON = 'icons/obj/clothing/glasses.dmi',