From db7fd37769184cd18604a861c843b6da02155c4b Mon Sep 17 00:00:00 2001 From: lbnesquik Date: Sat, 6 Oct 2018 09:31:27 +0200 Subject: [PATCH 1/7] stethoscope shitpost. Add some small vore feature. --- .../clothing/under/accessories/accessory.dm | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 97c2d3aa90..4f6eaa8f28 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -156,6 +156,19 @@ /obj/item/clothing/accessory/stethoscope/attack(mob/living/carbon/human/M, mob/living/user) if(ishuman(M) && isliving(user)) + var/message_holder //Holds pervy message + var/beat_size = "" //Small prey = quiet + for(var/belly in M.vore_organs) //Pervy edit. + var/obj/belly/B = belly + for(var/mob/living/carbon/human/H in B) + if(H.size_multiplier < 0.49) + beat_size = pick("quiet ", "hushed " ,"low " ,"hushed ") + if(H.stat == DEAD) //dead + message_holder = pick("Your listening is troubled by the occasional groaning of their body.", "There is some moderate burbling in the background.", "They seem to have a healthy metabolism as well.") + else //not dead + message_holder = pick("You can hear disparate heartbeats as well.", "You can hear a different [beat_size]heartbeat too.", "It sounds like there is more than one heartbeat." ,"You can pick up a [beat_size]heatbeat along with everything else.") + + if(user.a_intent == I_HELP) var/body_part = parse_zone(user.zone_sel.selecting) if(body_part) @@ -182,7 +195,7 @@ if(heart.is_bruised() || M.getOxyLoss() > 50) sound = "[pick("odd noises in","weak")] heartbeat" else - sound = "healthy heartbeat" + sound = "an healthy heartbeat" var/obj/item/organ/internal/heart/L = M.internal_organs_by_name[O_LUNGS] if(!L || M.losebreath) @@ -199,8 +212,12 @@ sound_strength = "hear a weak" sound = "pulse" - user.visible_message("[user] places [src] against [M]'s [body_part] and listens attentively.", "You place [src] against [their] [body_part]. You [sound_strength] [sound].") + user.visible_message("[user] places [src] against [M]'s [body_part] and listens attentively.", "You place [src] against [their] [body_part]. You [sound_strength] [sound]. [message_holder]") return + + + + return ..(M,user) //Medals From fa7ee8e015fe20aacbd57e24851684eb9a3a400f Mon Sep 17 00:00:00 2001 From: Kates <24830358+lbnesquik@users.noreply.github.com> Date: Sat, 6 Oct 2018 09:39:45 +0200 Subject: [PATCH 2/7] Update accessory.dm --- code/modules/clothing/under/accessories/accessory.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 4f6eaa8f28..e3a4fe6a77 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -195,7 +195,7 @@ if(heart.is_bruised() || M.getOxyLoss() > 50) sound = "[pick("odd noises in","weak")] heartbeat" else - sound = "an healthy heartbeat" + sound = "a healthy heartbeat" var/obj/item/organ/internal/heart/L = M.internal_organs_by_name[O_LUNGS] if(!L || M.losebreath) From 07bb2f0d1c8f27c480c644f3d66efcc100c51d04 Mon Sep 17 00:00:00 2001 From: Kates <24830358+lbnesquik@users.noreply.github.com> Date: Sat, 6 Oct 2018 09:57:38 +0200 Subject: [PATCH 3/7] Update accessory.dm --- code/modules/clothing/under/accessories/accessory.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index e3a4fe6a77..bb475ce666 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -156,6 +156,7 @@ /obj/item/clothing/accessory/stethoscope/attack(mob/living/carbon/human/M, mob/living/user) if(ishuman(M) && isliving(user)) + //Vorestation edit start var/message_holder //Holds pervy message var/beat_size = "" //Small prey = quiet for(var/belly in M.vore_organs) //Pervy edit. @@ -167,7 +168,7 @@ message_holder = pick("Your listening is troubled by the occasional groaning of their body.", "There is some moderate burbling in the background.", "They seem to have a healthy metabolism as well.") else //not dead message_holder = pick("You can hear disparate heartbeats as well.", "You can hear a different [beat_size]heartbeat too.", "It sounds like there is more than one heartbeat." ,"You can pick up a [beat_size]heatbeat along with everything else.") - + //Vorestation edit end if(user.a_intent == I_HELP) var/body_part = parse_zone(user.zone_sel.selecting) From cb23bd95d46c02497a40e72fde82ce00eacade37 Mon Sep 17 00:00:00 2001 From: Kates <24830358+lbnesquik@users.noreply.github.com> Date: Tue, 9 Oct 2018 07:29:02 +0200 Subject: [PATCH 4/7] Update accessory.dm --- code/modules/clothing/under/accessories/accessory.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index bb475ce666..a0e7681b55 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -196,7 +196,7 @@ if(heart.is_bruised() || M.getOxyLoss() > 50) sound = "[pick("odd noises in","weak")] heartbeat" else - sound = "a healthy heartbeat" + sound = "a healthy heartbeat" //Vorestation var/obj/item/organ/internal/heart/L = M.internal_organs_by_name[O_LUNGS] if(!L || M.losebreath) @@ -213,7 +213,7 @@ sound_strength = "hear a weak" sound = "pulse" - user.visible_message("[user] places [src] against [M]'s [body_part] and listens attentively.", "You place [src] against [their] [body_part]. You [sound_strength] [sound]. [message_holder]") + user.visible_message("[user] places [src] against [M]'s [body_part] and listens attentively.", "You place [src] against [their] [body_part]. You [sound_strength] [sound]. [message_holder]") //Vorestation return From d1749b598138f973eeccfe381eb3a39292b434d7 Mon Sep 17 00:00:00 2001 From: Kates <24830358+lbnesquik@users.noreply.github.com> Date: Tue, 9 Oct 2018 07:29:44 +0200 Subject: [PATCH 5/7] Update accessory.dm --- code/modules/clothing/under/accessories/accessory.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index a0e7681b55..9de89fb71e 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -216,9 +216,6 @@ user.visible_message("[user] places [src] against [M]'s [body_part] and listens attentively.", "You place [src] against [their] [body_part]. You [sound_strength] [sound]. [message_holder]") //Vorestation return - - - return ..(M,user) //Medals From cb501e395dfd37c606b23ec61d05233e22868068 Mon Sep 17 00:00:00 2001 From: lbnesquik Date: Sat, 13 Oct 2018 09:28:27 +0200 Subject: [PATCH 6/7] Please review --- code/modules/clothing/under/accessories/accessory.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 9de89fb71e..e8c613f943 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -155,14 +155,14 @@ return 1 /obj/item/clothing/accessory/stethoscope/attack(mob/living/carbon/human/M, mob/living/user) - if(ishuman(M) && isliving(user)) + if(isliving(user)) //Vorestation edit start var/message_holder //Holds pervy message var/beat_size = "" //Small prey = quiet for(var/belly in M.vore_organs) //Pervy edit. var/obj/belly/B = belly for(var/mob/living/carbon/human/H in B) - if(H.size_multiplier < 0.49) + if(H.size_multiplier < 0.5) beat_size = pick("quiet ", "hushed " ,"low " ,"hushed ") if(H.stat == DEAD) //dead message_holder = pick("Your listening is troubled by the occasional groaning of their body.", "There is some moderate burbling in the background.", "They seem to have a healthy metabolism as well.") @@ -196,7 +196,7 @@ if(heart.is_bruised() || M.getOxyLoss() > 50) sound = "[pick("odd noises in","weak")] heartbeat" else - sound = "a healthy heartbeat" //Vorestation + sound = "a healthy heartbeat" //Vorestation edit var/obj/item/organ/internal/heart/L = M.internal_organs_by_name[O_LUNGS] if(!L || M.losebreath) @@ -213,7 +213,7 @@ sound_strength = "hear a weak" sound = "pulse" - user.visible_message("[user] places [src] against [M]'s [body_part] and listens attentively.", "You place [src] against [their] [body_part]. You [sound_strength] [sound]. [message_holder]") //Vorestation + user.visible_message("[user] places [src] against [M]'s [body_part] and listens attentively.", "You place [src] against [their] [body_part]. You [sound_strength] [sound]. [message_holder]") //Vorestation edit. ([message holder]) return return ..(M,user) From d8fd7ea6ac17272236888fe7a4ca472c985093bc Mon Sep 17 00:00:00 2001 From: lbnesquik Date: Mon, 15 Oct 2018 16:34:55 +0200 Subject: [PATCH 7/7] Update to listen to the reviews --- code/modules/clothing/under/accessories/accessory.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index e8c613f943..9103730b2b 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -158,16 +158,16 @@ if(isliving(user)) //Vorestation edit start var/message_holder //Holds pervy message + var/message_holder2 //Hods the nutrition related message. var/beat_size = "" //Small prey = quiet for(var/belly in M.vore_organs) //Pervy edit. var/obj/belly/B = belly for(var/mob/living/carbon/human/H in B) if(H.size_multiplier < 0.5) beat_size = pick("quiet ", "hushed " ,"low " ,"hushed ") - if(H.stat == DEAD) //dead - message_holder = pick("Your listening is troubled by the occasional groaning of their body.", "There is some moderate burbling in the background.", "They seem to have a healthy metabolism as well.") - else //not dead - message_holder = pick("You can hear disparate heartbeats as well.", "You can hear a different [beat_size]heartbeat too.", "It sounds like there is more than one heartbeat." ,"You can pick up a [beat_size]heatbeat along with everything else.") + message_holder = pick("You can hear disparate heartbeats as well.", "You can hear a different [beat_size]heartbeat too.", "It sounds like there is more than one heartbeat." ,"You can pick up a [beat_size]heatbeat along with everything else.") + if(M.nutrition > 900) //dead + message_holder2 = pick("Your listening is troubled by the occasional deep groan of their body.", "There is some moderate bubbling in the background.", "They seem to have a healthy metabolism as well.") //Vorestation edit end if(user.a_intent == I_HELP) @@ -213,7 +213,7 @@ sound_strength = "hear a weak" sound = "pulse" - user.visible_message("[user] places [src] against [M]'s [body_part] and listens attentively.", "You place [src] against [their] [body_part]. You [sound_strength] [sound]. [message_holder]") //Vorestation edit. ([message holder]) + user.visible_message("[user] places [src] against [M]'s [body_part] and listens attentively.", "You place [src] against [their] [body_part]. You [sound_strength] [sound]. [message_holder][message_holder2]") //Vorestation edit. ([message holder] & [message_holder2]) return return ..(M,user)