Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds booping #1471

Merged
merged 1 commit into from
Mar 24, 2024
Merged

Adds booping #1471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/game/area/areas/shuttles.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
if(SSshuttle.arrivals?.mode == SHUTTLE_CALL)
var/atom/movable/screen/splash/Spl = new(null, boarder.client, TRUE)
Spl.Fade(TRUE)
boarder.playsound_local(get_turf(boarder), 'monkestation/sound/ai/duke/welcome/welcome2.ogg', 25) //MONKESTATION EDIT
boarder.playsound_local(get_turf(boarder), 'monkestation/sound/ai/duke/welcome/welcome2.ogg', 50) //MONKESTATION EDIT
boarder.update_parallax_teleport()


Expand Down
18 changes: 15 additions & 3 deletions code/modules/mob/living/carbon/carbon_defense.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
if(SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_HAND, user, modifiers) & COMPONENT_CANCEL_ATTACK_CHAIN)
. = TRUE


if(length(diseases) && isliving(user))
var/mob/living/living = user
var/block = living.check_contact_sterility(BODY_ZONE_EVERYTHING)
Expand All @@ -196,7 +196,7 @@
if(length(contact) && !block)
for(var/datum/disease/advanced/V as anything in contact)
infect_disease(V, notes="(Skin Contact - (Bump), coming from [living])")


for(var/datum/surgery/operations as anything in surgeries)
if((user.istate & ISTATE_HARM))
Expand Down Expand Up @@ -226,7 +226,7 @@
var/datum/disease/D = thing
if(D.spread_flags & DISEASE_SPREAD_CONTACT_SKIN)
ContactContractDisease(D)
*/
*/
if(!(user.istate & ISTATE_HARM))
help_shake_act(user)
return FALSE
Expand Down Expand Up @@ -459,6 +459,18 @@
null, span_hear("You hear the rustling of clothes."), DEFAULT_MESSAGE_RANGE, list(helper, src))
to_chat(helper, span_notice("You shake [src] trying to pick [p_them()] up!"))
to_chat(src, span_notice("[helper] shakes you to get you up!"))
//Monkestation addition start: this is a port of #77651 which was closed, so I'm putting this as an addition
else if(helper.zone_selected == BODY_ZONE_PRECISE_MOUTH) //Boops
if(HAS_TRAIT(src, TRAIT_BADTOUCH) && prob(75))
helper.visible_message(span_notice("[src] matrix dodges [helper]'s boop, holy shit!"), span_notice("[src] matrix dodges your boop, holy shit!"))
else if(istype(get_item_by_slot(ITEM_SLOT_MASK), /obj/item/clothing/mask/gas/clown_hat))
playsound(src, 'sound/items/bikehorn.ogg', 50, TRUE)
helper.visible_message(span_notice("[helper] honks [src]'s nose"), span_notice("You honk [src]'s nose."))
else if(src.dna.species.bodytype & BODYTYPE_SNOUTED)
helper.visible_message(span_notice("[helper] boops [src]'s snout."), span_notice("You boop [src] on the snout."))
else
helper.visible_message(span_notice("[helper] boops [src]'s nose."), span_notice("You boop [src] on the nose."))
//Monkestation addition end
else if(check_zone(helper.zone_selected) == BODY_ZONE_HEAD && get_bodypart(BODY_ZONE_HEAD)) //Headpats!
helper.visible_message(span_notice("[helper] gives [src] a pat on the head to make [p_them()] feel better!"), \
null, span_hear("You hear a soft patter."), DEFAULT_MESSAGE_RANGE, list(helper, src))
Expand Down
Loading