cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 00:29:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sensitive Snout Negative Quirk! (#3183)

Browse Source 
* Sensitive Snout Negative Quirk!

Adds the "Sensitive Snout" quirk, that causes anyone afflicted with it to drop to the ground upon being booped.

* Fixing Defines

Fixing a small trait definition conflict.

* I fucking hate this PR

Fixed Linter BS

* Linters go brrr

fixed

* Boop Nerf?

* Final Edit
This commit is contained in:
Cheshify
2021-02-09 00:54:34 +00:00
committed by GitHub
parent 3cfd853bf3
commit e10285df29
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/~skyrat_defines/traits.dm
+1 -1
View File
@@ -8,5 +8,5 @@
#define TRAIT_DNC "cant_clone"
#define TRAIT_DNR "cant_revive" //You just can't be revived without supernatural means
#define TRAIT_HARD_SOLES "hard_soles" // No step on glass
#define TRAIT_SENSITIVESNOUT "sensitive_snout" // Snout hurts when booped
#define TRAIT_DETECTIVE "detective_ability" //Given to the detective, if they have this, they can see syndicate special descriptions.
code/modules/mob/living/carbon/carbon_defense.dm
+7 -3
View File
@@ -485,12 +485,16 @@
to_chat(M, "<span class='notice'>You shake [src] trying to pick [p_them()] up!</span>")
to_chat(src, "<span class='notice'>[M] shakes you to get you up!</span>")
//SKYRAT EDIT ADDITION BEGIN - EMOTES
//SKYRAT EDIT ADDITION BEGIN - EMOTES -- SENSITIVE SNOUT TRAIT ADDITION
else if(M.zone_selected == BODY_ZONE_PRECISE_MOUTH)
nosound = TRUE
M.visible_message("<span class='notice'>[M] boops [src]'s nose.", \
"<span class='notice'>You boop [src] on the nose.</span>")
playsound(src, 'modular_skyrat/modules/emotes/sound/emotes/Nose_boop.ogg', 50, 0)
if(HAS_TRAIT(src, TRAIT_SENSITIVESNOUT) && get_location_accessible(src, BODY_ZONE_PRECISE_MOUTH))
to_chat(src, "<span class='warning'>[M] boops you on your sensitive nose, sending you to the ground!</span>")
src.Knockdown(20)
src.apply_damage(30, STAMINA, BODY_ZONE_CHEST)
M.visible_message("<span class='notice'>[M] boops [src]'s nose.", \
"<span class='notice'>You boop [src] on the nose.</span>")
//SKYRAT EDIT ADDITION END
else if(check_zone(M.zone_selected) == BODY_ZONE_HEAD) //Headpats!
modular_skyrat/master_files/code/datums/traits/negative.dm
+9
View File
@@ -6,3 +6,12 @@
value = -4
mob_trait = TRAIT_MOOD_NOEXAMINE
medical_record_text = "Patient is incapable of communicating their emotions."
/datum/quirk/sensitivesnout
name = "Sensitive Snout"
desc = "Your face has always been sensitive, and it really hurts when someone pokes it!"
gain_text = "<span class='notice'>Your face is awfully sensitive.</span>"
lose_text = "<span class='notice'>Your face feels numb.</span>"
medical_record_text = "Patient's nose seems to have a cluster of nerves in the tip, would advise against direct contact."
value = -2
mob_trait = TRAIT_SENSITIVESNOUT