Adds Affection Aversion quirk (#783)

* Adds Affection Aversion quirk Stops affection modules. Very simple. * I hate you, github May or may not do anything. Stop giving me a merge conflict. Stop it. * Revert "I hate you, github" This reverts commit 6515023cc3f72d97d90bbdf982857b1d2724b1cf. * Attempts to revert traits.dm Because something went TERRIBLY wrong with my fork and/or my editor and I'm not sure why. * Added quirk proper now that my fork is unfucked Why did this even happen? * These lists are alphabetized * Same here --------- Co-authored-by: DBGit42 <[email protected]> Co-authored-by: Bloop <[email protected]> Co-authored-by: Iajret <[email protected]>
Fluffy-Frontier · Nov 24, 2023 · ddd1e26 · ddd1e26
1 parent 901675e
commit ddd1e26
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 7 deletions.
diff --git a/code/__DEFINES/~skyrat_defines/traits/declarations.dm b/code/__DEFINES/~skyrat_defines/traits/declarations.dm
@@ -14,6 +14,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_NORUNNING "norunning" // You walk!
 #define TRAIT_EXCITABLE "wagwag" //Will wag when patted!
 #define TRAIT_OXYIMMUNE	"oxyimmune" // Immune to oxygen damage, ideally give this to all non-breathing species or bad stuff will happen
+#define TRAIT_AFFECTION_AVERSION "affection_aversion" // No more dogborg licking. "Dogborg bad" is no longer a personality
 #define TRAIT_PERSONALSPACE "personalspace" // Block/counter-attack ass-slaps
 #define TRAIT_MOOD_NOEXAMINE "mood_noexamine" // Can't assess your own mood
 #define TRAIT_DNR "do_not_revive" // Can't be revived without supernatural means or admin intervention

diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm
@@ -558,6 +558,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 	),
 	// SKYRAT EDIT ADDITION START - SKYRAT TRAITS
 	/obj/item/toy/plush/skyrat = list(
+		"TRAIT_AFFECTION_AVERSION" = TRAIT_AFFECTION_AVERSION,
 		"TRAIT_APHRO" = TRAIT_APHRO,
 		"TRAIT_AVIAN" = TRAIT_AVIAN,
 		"TRAIT_ASH_ASPECT" = TRAIT_ASH_ASPECT,

diff --git a/code/_globalvars/traits/admin_tooling.dm b/code/_globalvars/traits/admin_tooling.dm
@@ -278,6 +278,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 	),
 	// SKYRAT EDIT ADDITION START - SKYRAT TRAITS
 	/obj/item/toy/plush/skyrat = list(
+		"TRAIT_AFFECTION_AVERSION" = TRAIT_AFFECTION_AVERSION,
 		"TRAIT_APHRO" = TRAIT_APHRO,
 		"TRAIT_AVIAN" = TRAIT_AVIAN,
 		"TRAIT_ASH_ASPECT" = TRAIT_ASH_ASPECT,

diff --git a/modular_skyrat/master_files/code/datums/traits/neutral.dm b/modular_skyrat/master_files/code/datums/traits/neutral.dm
@@ -20,6 +20,16 @@ GLOBAL_VAR_INIT(DNR_trait_overlay, generate_DNR_trait_overlay())
 	mob_trait = TRAIT_EXCITABLE
 	icon = FA_ICON_LAUGH_BEAM
 
+/datum/quirk/affectionaversion
+	name = "Affection Aversion"
+	desc = "You refuse to be licked or nosed by quadruped cyborgs."
+	gain_text = span_notice("You've been added to the Do Not Lick and No Nosing registries.")
+	lose_text = span_notice("You've been removed from the Do Not Lick and No Nosing registries.")
+	medical_record_text = "Patient is in the Do Not Lick and No Nosing registries."
+	value = 0
+	mob_trait = TRAIT_AFFECTION_AVERSION
+	icon = FA_ICON_CIRCLE_EXCLAMATION
+
 /datum/quirk/personalspace
 	name = "Personal Space"
 	desc = "You'd rather people keep their hands off your rear end."

diff --git a/modular_skyrat/modules/borgs/code/robot_upgrade.dm b/modular_skyrat/modules/borgs/code/robot_upgrade.dm
@@ -354,12 +354,15 @@
 	var/mob/living/silicon/robot/borg = user
 	var/mob/living/mob = target
 
-	if(check_zone(borg.zone_selected) == "head")
-		borg.visible_message(span_warning("\the [borg] affectionally licks \the [mob]'s face!"), span_notice("You affectionally lick \the [mob]'s face!"))
-		playsound(borg, 'sound/effects/attackblob.ogg', 50, 1)
+	if(!HAS_TRAIT(target, TRAIT_AFFECTION_AVERSION)) // Checks for Affection Aversion trait
+		if(check_zone(borg.zone_selected) == "head")
+			borg.visible_message(span_warning("\the [borg] affectionally licks \the [mob]'s face!"), span_notice("You affectionally lick \the [mob]'s face!"))
+			playsound(borg, 'sound/effects/attackblob.ogg', 50, 1)
+		else
+			borg.visible_message(span_warning("\the [borg] affectionally licks \the [mob]!"), span_notice("You affectionally lick \the [mob]!"))
+			playsound(borg, 'sound/effects/attackblob.ogg', 50, 1)
 	else
-		borg.visible_message(span_warning("\the [borg] affectionally licks \the [mob]!"), span_notice("You affectionally lick \the [mob]!"))
-		playsound(borg, 'sound/effects/attackblob.ogg', 50, 1)
+		to_chat(user, span_warning("ERROR: [target] is on the Do Not Lick registry!"))
 
 // Quadruped nose - Boop
 /obj/item/quadborg_nose
@@ -375,8 +378,12 @@
 	. = ..()
 	if(!proximity)
 		return
-	do_attack_animation(target, null, src)
-	user.visible_message(span_notice("[user] [pick("nuzzles", "pushes", "boops")] \the [target.name] with their nose!"))
+
+	if(!HAS_TRAIT(target, TRAIT_AFFECTION_AVERSION)) // Checks for Affection Aversion trait
+		do_attack_animation(target, null, src)
+		user.visible_message(span_notice("[user] [pick("nuzzles", "pushes", "boops")] \the [target.name] with their nose!"))
+	else
+		to_chat(user, span_warning("ERROR: [target] is on the No Nosing registry!"))
 
 /// The Shrinkening
 /mob/living/silicon/robot