From 18e98cb0199f423bcb231dfe40c81bf59f7e0176 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Sun, 26 Feb 2023 23:42:59 -0300 Subject: [PATCH] Cyborgs can now use succumb (#15887) * cyborg succumb * Update code/modules/mob/living/silicon/robot/robot.dm Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> --------- Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> --- code/modules/mob/living/silicon/robot/robot.dm | 12 ++++++++++-- html/changelogs/alberyk-cyborgsuccumb.yml | 6 ++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/alberyk-cyborgsuccumb.yml diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 5bc0c90486c..d17d858af37 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -511,7 +511,7 @@ set category = "Robot Commands" set name = "View Holomap" set desc = "View a virtual map of the surrounding area." - + var/obj/machinery/station_map/mobile/holo_map_object if(src.holo_map) holo_map_object = src.holo_map.resolve() @@ -520,7 +520,7 @@ if(!holo_map_object) holo_map_object = new(src) src.holo_map = WEAKREF(holo_map) - + holo_map_object.startWatching(src) /mob/living/silicon/robot/verb/rebuild_overlays() @@ -1296,3 +1296,11 @@ to_chat(src, SPAN_DANGER("Hack attempt detected and thwarted. Evacuate the area immediately.")) return SMOOTH_TRUE return + +/mob/living/silicon/robot/succumb() + set hidden = TRUE + if(health < maxHealth / 3) + death() + to_chat(src, SPAN_NOTICE("You have given up life and succumbed to death.")) + else + to_chat(src, SPAN_NOTICE("You are not injured enough to succumb to death!")) \ No newline at end of file diff --git a/html/changelogs/alberyk-cyborgsuccumb.yml b/html/changelogs/alberyk-cyborgsuccumb.yml new file mode 100644 index 00000000000..16b626be1d8 --- /dev/null +++ b/html/changelogs/alberyk-cyborgsuccumb.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - rscadd: "Cyborgs can now use the succumb verb." \ No newline at end of file