From 3c67a19a205ad747dfe0438642ceda27d2c20f33 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Fri, 21 Aug 2020 20:31:43 -0700 Subject: [PATCH] Ports borg petting from CHOMPStation --- code/modules/mob/living/silicon/robot/robot.dm | 16 ++++++++++++++++ html/changelogs/Lorilili - borgpet.yml | 5 +++++ sound/effects/clang2.ogg | Bin 0 -> 7263 bytes 3 files changed, 21 insertions(+) create mode 100644 html/changelogs/Lorilili - borgpet.yml create mode 100644 sound/effects/clang2.ogg diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 414365db37..b9fcdd72ec 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -688,11 +688,15 @@ if(istype(user,/mob/living/carbon/human)) var/mob/living/carbon/human/H = user +<<<<<<< HEAD //VOREStation Removal //if(H.species.can_shred(H)) // attack_generic(H, rand(30,50), "slashed") // return //VOREStation Edit: Adding borg petting. Help intent pets, Disarm intent taps, Grab should remove the battery for replacement, and Harm is punching(no damage) +======= + //Adding borg petting. Help intent pets, Disarm intent taps, Grab should remove the battery for replacement, and Harm is punching(no damage) +>>>>>>> 1e53bf1... Merge pull request #7478 from listerla/borgpet switch(H.a_intent) if(I_HELP) visible_message("[H] pets [src].") @@ -703,15 +707,27 @@ attack_generic(H, rand(30,50), "slashed") return else +<<<<<<< HEAD playsound(src, 'sound/effects/bang.ogg', 10, 1) +======= + playsound(src.loc, 'sound/effects/bang.ogg', 10, 1) +>>>>>>> 1e53bf1... Merge pull request #7478 from listerla/borgpet visible_message("[H] punches [src], but doesn't leave a dent.") return if(I_DISARM) H.do_attack_animation(src) +<<<<<<< HEAD playsound(src, 'sound/effects/clang1.ogg', 10, 1) visible_message("[H] taps [src].") return //VOREStation Edit: Addition of borg petting end +======= + playsound(src.loc, 'sound/effects/clang2.ogg', 10, 1) + visible_message("[H] taps [src].") + return + //Addition of borg petting end + +>>>>>>> 1e53bf1... Merge pull request #7478 from listerla/borgpet if(opened && !wiresexposed && (!istype(user, /mob/living/silicon))) var/datum/robot_component/cell_component = components["power cell"] if(cell) diff --git a/html/changelogs/Lorilili - borgpet.yml b/html/changelogs/Lorilili - borgpet.yml new file mode 100644 index 0000000000..6af4fa0c25 --- /dev/null +++ b/html/changelogs/Lorilili - borgpet.yml @@ -0,0 +1,5 @@ +author: Lorilili +delete-after: True +changes: + - rscadd: "You can now pet borgs on help intent and punch on hurt intent. Old behavior is now grab intent." + diff --git a/sound/effects/clang2.ogg b/sound/effects/clang2.ogg new file mode 100644 index 0000000000000000000000000000000000000000..91b13eb2efad48ddcdba337e3c302e1d1e292d3e GIT binary patch literal 7263 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 W;~%+^S5EqV4v3Tz3DEc)0R2CJa)OQk literal 0 HcmV?d00001