From 60e22e610d3a96dd7f0a2e797c838ed2fdc15b88 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sun, 16 Jun 2024 05:28:49 +0200 Subject: [PATCH] [MIRROR] Misha - the bear (#28204) * Misha - the bear (#83949) ## About The Pull Request ![image](https://github.com/tgstation/tgstation/assets/96586172/beeee166-f838-4bce-ab52-667ed566e25c) Adds Misha the bear to icebox HoS office, a snow bear with the same health stats as Sgt. Araneus. ## Why It's Good For The Game With how easy it is to break into the HoS office on icebox (you don't need any space protection) it never made sense to keep a slow pet in the office. The bear is fast and deals 15 damage, while also resistant to cold. I think it adds more depth that the HoS tamed a bear on icebox and trained it. Also the bear fits the map. ## Changelog :cl: grungussuss add: Added Misha the bear to the HoS office on icebox. /:cl: * Misha - the bear --------- Co-authored-by: grungussuss <96586172+Sadboysuss@users.noreply.github.com> --- _maps/map_files/IceBoxStation/IceBoxStation.dmm | 14 +++++++------- code/game/objects/structures/beds_chairs/bed.dm | 5 +++++ .../antagonists/traitor/objectives/kill_pet.dm | 1 + code/modules/events/ghost_role/sentience.dm | 1 + .../mob/living/basic/space_fauna/bear/_bear.dm | 9 +++++++++ 5 files changed, 23 insertions(+), 7 deletions(-) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 1e2662c209e..717e27c63bc 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -27554,12 +27554,6 @@ dir = 4 }, /area/station/hallway/secondary/entry) -"ioi" = ( -/obj/structure/bed/dogbed/lia, -/obj/structure/cable, -/mob/living/basic/carp/pet/lia, -/turf/open/floor/carpet/royalblue, -/area/station/command/heads_quarters/hos) "iol" = ( /obj/machinery/camera/directional/south{ c_tag = "MiniSat Teleporter"; @@ -63084,6 +63078,12 @@ /obj/structure/cable, /turf/open/floor/plating, /area/mine/storage) +"sIQ" = ( +/obj/structure/cable, +/mob/living/basic/bear/snow/misha, +/obj/structure/bed/dogbed/misha, +/turf/open/floor/carpet/royalblue, +/area/station/command/heads_quarters/hos) "sIX" = ( /obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /obj/machinery/door/airlock/hydroponics/glass{ @@ -240656,7 +240656,7 @@ lQc nbp mgU nbt -ioi +sIQ fad azx tDw diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm index e037043cc91..4cfd6355eb0 100644 --- a/code/game/objects/structures/beds_chairs/bed.dm +++ b/code/game/objects/structures/beds_chairs/bed.dm @@ -272,6 +272,11 @@ name = "Cayenne's bed" anchored = TRUE +/obj/structure/bed/dogbed/misha + desc = "There is fur all over it, and some blood..." + name = "Misha's bed" + anchored = TRUE + /obj/structure/bed/dogbed/lia desc = "Seems kind of... fishy." name = "Lia's bed" diff --git a/code/modules/antagonists/traitor/objectives/kill_pet.dm b/code/modules/antagonists/traitor/objectives/kill_pet.dm index 21bf06eb386..ddaf6ee47ce 100644 --- a/code/modules/antagonists/traitor/objectives/kill_pet.dm +++ b/code/modules/antagonists/traitor/objectives/kill_pet.dm @@ -55,6 +55,7 @@ JOB_HEAD_OF_SECURITY = list( /mob/living/basic/carp/pet/lia, /mob/living/basic/spider/giant/sgt_araneus, + /mob/living/basic/bear/snow/misha, ), JOB_WARDEN = list( /mob/living/basic/pet/dog/pug/mcgriff diff --git a/code/modules/events/ghost_role/sentience.dm b/code/modules/events/ghost_role/sentience.dm index 002c161f66c..4017361dba5 100644 --- a/code/modules/events/ghost_role/sentience.dm +++ b/code/modules/events/ghost_role/sentience.dm @@ -17,6 +17,7 @@ GLOBAL_LIST_INIT(high_priority_sentience, typecacheof(list( /mob/living/basic/spider/giant/sgt_araneus, /mob/living/simple_animal/bot/secbot/beepsky, /mob/living/simple_animal/hostile/retaliate/goose/vomit, + /mob/living/basic/bear/snow/misha, ))) /datum/round_event_control/sentience diff --git a/code/modules/mob/living/basic/space_fauna/bear/_bear.dm b/code/modules/mob/living/basic/space_fauna/bear/_bear.dm index c528819b5bb..f4a1267e9db 100644 --- a/code/modules/mob/living/basic/space_fauna/bear/_bear.dm +++ b/code/modules/mob/living/basic/space_fauna/bear/_bear.dm @@ -82,6 +82,15 @@ icon_dead = "snowbear_dead" desc = "It's a polar bear, in space, but not actually in space." +/mob/living/basic/bear/snow/misha + name = "Misha" + real_name = "Misha" + desc = "Tamed and trained by the Head of Security. Only beasts are above deceit." + gold_core_spawnable = NO_SPAWN + maxHealth = 250 + health = 250 + faction = list(FACTION_NEUTRAL) + /mob/living/basic/bear/snow/ancient name = "ancient polar bear" desc = "A grizzled old polar bear, its hide thick enough to make it impervious to almost all weapons."