diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 414365db37..5ba5b7deb8 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -692,7 +692,7 @@ //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) switch(H.a_intent) if(I_HELP) visible_message("[H] pets [src].") @@ -703,15 +703,15 @@ attack_generic(H, rand(30,50), "slashed") return else - playsound(src, 'sound/effects/bang.ogg', 10, 1) + playsound(src.loc, 'sound/effects/bang.ogg', 10, 1) visible_message("[H] punches [src], but doesn't leave a dent.") return if(I_DISARM) H.do_attack_animation(src) - playsound(src, 'sound/effects/clang1.ogg', 10, 1) + playsound(src.loc, 'sound/effects/clang2.ogg', 10, 1) visible_message("[H] taps [src].") return - //VOREStation Edit: Addition of borg petting end + if(opened && !wiresexposed && (!istype(user, /mob/living/silicon))) var/datum/robot_component/cell_component = components["power cell"] if(cell) @@ -1157,4 +1157,4 @@ uneq_active() if(current_selection_index) // Select what the player had before if possible. - select_module(current_selection_index) \ No newline at end of file + select_module(current_selection_index) 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 0000000000..91b13eb2ef Binary files /dev/null and b/sound/effects/clang2.ogg differ