From 75375efce9e141d3687aa2ebda025bd8a519597f Mon Sep 17 00:00:00 2001 From: SabreML <57483089+SabreML@users.noreply.github.com> Date: Thu, 17 Jun 2021 10:23:14 +0100 Subject: [PATCH] Why is this a thing, really (#16169) --- code/__HELPERS/traits.dm | 3 - code/_globalvars/traits.dm | 1 - code/game/objects/items/hand_item.dm | 72 ------------------ code/modules/mob/living/carbon/human/emote.dm | 15 +--- sound/effects/kiss.ogg | Bin 8415 -> 0 bytes 5 files changed, 4 insertions(+), 87 deletions(-) delete mode 100644 sound/effects/kiss.ogg diff --git a/code/__HELPERS/traits.dm b/code/__HELPERS/traits.dm index 7b49249690d..4241cee9e9b 100644 --- a/code/__HELPERS/traits.dm +++ b/code/__HELPERS/traits.dm @@ -152,9 +152,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_NOEXAMINE "no_examine" #define TRAIT_NOPAIN "no_pain" -/// Blowing kisses actually does damage to the victim -#define TRAIT_KISS_OF_DEATH "kiss_of_death" - //***** ITEM TRAITS *****// /// Show what machine/door wires do when held. #define TRAIT_SHOW_WIRE_INFO "show_wire_info" diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm index 3d783ece42c..da0fb3b8fc2 100644 --- a/code/_globalvars/traits.dm +++ b/code/_globalvars/traits.dm @@ -45,7 +45,6 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_DWARF" = TRAIT_DWARF, "TRAIT_SILENT_FOOTSTEPS" = TRAIT_SILENT_FOOTSTEPS, "TRAIT_ALCOHOL_TOLERANCE" = TRAIT_ALCOHOL_TOLERANCE, - "TRAIT_KISS_OF_DEATH" = TRAIT_KISS_OF_DEATH, "TRAIT_COMIC_SANS" = TRAIT_COMIC_SANS, "TRAIT_NOFINGERPRINTS" = TRAIT_NOFINGERPRINTS, diff --git a/code/game/objects/items/hand_item.dm b/code/game/objects/items/hand_item.dm index 7f378aa6cdc..fe0d198e266 100644 --- a/code/game/objects/items/hand_item.dm +++ b/code/game/objects/items/hand_item.dm @@ -42,75 +42,3 @@ table_smacks_left-- if(table_smacks_left <= 0) qdel(src) - -/obj/item/kisser - name = "kiss" - desc = "I want you all to know, everyone and anyone, to seal it with a kiss." - icon = 'icons/mob/animal.dmi' - icon_state = "heart" - item_state = "nothing" - force = 0 - throwforce = 0 - flags = DROPDEL | ABSTRACT - /// The kind of projectile this version of the kiss blower fires - var/kiss_type = /obj/item/projectile/kiss - -/obj/item/kisser/afterattack(atom/target, mob/user, flag, params) - var/turf/user_turf = get_turf(user) - var/obj/item/projectile/blown_kiss = new kiss_type(user_turf) - user.visible_message("[user] blows \a [blown_kiss] at [target]!", "You blow \a [blown_kiss] at [target]!") - - //Shooting Code: - blown_kiss.spread = 0 - blown_kiss.original = target - blown_kiss.firer = user // don't hit ourself that would be really annoying - blown_kiss.preparePixelProjectile(target, user_turf, user, params) - blown_kiss.fire() - qdel(src) - -/obj/item/kisser/death - name = "kiss of death" - desc = "If looks could kill, they'd be this." - color = COLOR_BLACK - kiss_type = /obj/item/projectile/kiss/death - -/obj/item/projectile/kiss - name = "kiss" - icon = 'icons/mob/animal.dmi' - icon_state = "heart" - hitsound = 'sound/effects/kiss.ogg' - hitsound_wall = 'sound/effects/kiss.ogg' - pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE - speed = 1.6 - damage_type = BRUTE - damage = 0 - nodamage = TRUE // love can't actually hurt you - armour_penetration = 100 // but if it could, it would cut through even the thickest plate - flag = "magic" // and most importantly, love is magic~ - -/obj/item/projectile/kiss/fire(angle) - if(firer) - name = "[name] blown by [firer]" - return ..() - -/obj/item/projectile/kiss/on_hit(atom/target, blocked, hit_zone) - def_zone = BODY_ZONE_HEAD // let's keep it PG, people - . = ..() - -/obj/item/projectile/kiss/death - name = "kiss of death" - nodamage = FALSE // okay i kinda lied about love not being able to hurt you - damage = 35 - sharp = TRUE - color = COLOR_BLACK - -/obj/item/projectile/kiss/death/on_hit(atom/target, blocked, pierce_hit) - . = ..() - if(!iscarbon(target)) - return - var/mob/living/carbon/heartbreakee = target - var/obj/item/organ/internal/heart/dont_go_breakin_my_heart = heartbreakee.get_organ_slot("heart") - if(dont_go_breakin_my_heart) - dont_go_breakin_my_heart.receive_damage(999) - else // You're probably a snowflakey species or Xenomorph - heartbreakee.adjustFireLoss(1000) // the sickest of burns diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index d80ab50e0b0..1e82747b986 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -138,7 +138,7 @@ on_CD = handle_emote_CD() if("clap", "claps") on_CD = handle_emote_CD() - if("kiss", "kisses", "slap", "slaps") + if("slap", "slaps") on_CD = handle_emote_CD(3 SECONDS) //Everything else, including typos of the above emotes else @@ -516,17 +516,10 @@ m_type = 1 if("kiss", "kisses") - var/kiss_type = /obj/item/kisser + var/M = handle_emote_param(param) - if(HAS_TRAIT(src, TRAIT_KISS_OF_DEATH)) - kiss_type = /obj/item/kisser/death - - var/obj/item/kiss_blower = new kiss_type(src) - if(put_in_hands(kiss_blower)) - to_chat(src, "You ready your kiss-blowing hand.") - else - qdel(kiss_blower) - to_chat(src, "You're incapable of blowing a kiss in your current state.") + message = "[src] blows a kiss[M ? " at [M]" : ""]." + m_type = 1 if("blush", "blushes") message = "[src] blushes." diff --git a/sound/effects/kiss.ogg b/sound/effects/kiss.ogg deleted file mode 100644 index 699b13a8de84a65421744ea450e42f51824666da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8415 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 Dv|lH6