diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm index 6e3d2ccd98d..473e7b3672e 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm @@ -250,6 +250,10 @@ }, /turf/simulated/floor/plating/asteroid/snow/atmosphere, /area/ruin/powered/snow_biodome) +"bJ" = ( +/mob/living/simple_animal/hostile/bear/polar, +/turf/simulated/floor/plating/asteroid/snow/atmosphere, +/area/ruin/powered/snow_biodome) "bM" = ( /obj/machinery/light, /turf/simulated/floor/plating/asteroid/snow/atmosphere, @@ -1267,7 +1271,7 @@ aB ak ak aC -ak +bJ Wg QI tb diff --git a/code/modules/clothing/head/misc_hats.dm b/code/modules/clothing/head/misc_hats.dm index 1e4577a7cd7..f5f066b74db 100644 --- a/code/modules/clothing/head/misc_hats.dm +++ b/code/modules/clothing/head/misc_hats.dm @@ -367,7 +367,7 @@ icon_state = "enhead" /obj/item/clothing/head/bearpelt - name = "bear pelt hat" + name = "space bear pelt hat" desc = "Fuzzy." icon_state = "bearpelt" item_state = "bearpelt" @@ -377,6 +377,22 @@ "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) +/obj/item/clothing/head/bearpelt/black + name = "black bear pelt hat" + icon_state = "black_bearpelt" + item_state = "black_bearpelt" + +/obj/item/clothing/head/bearpelt/brown + name = "brown bear pelt hat" + icon_state = "brown_bearpelt" + item_state = "brown_bearpelt" + +/obj/item/clothing/head/bearpelt/polar + name = "polar bear pelt hat" + desc = "Fuzzy, and also stained with blood." + icon_state = "polar_bearpelt" + item_state = "polar_bearpelt" + /obj/item/clothing/head/xenos name = "xeno helmet" desc = "A helmet made out of chitinous alien hide." diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 690d19e6303..6d2a3cce5a1 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -644,13 +644,6 @@ icon_state = "charred_visor" species_restricted = list("Vox") -/// Gibson1027: Sploosh -/obj/item/clothing/head/bearpelt/fluff/polar - name = "polar bear pelt hat" - desc = "Fuzzy, and also stained with blood." - icon = 'icons/obj/custom_items.dmi' - icon_state = "polarbearpelt" - /// Sparkyninja: Neil Wilkinson /obj/item/clothing/head/fluff/sparkyninja_beret name = "royal marines commando beret" diff --git a/code/modules/hallucinations/effects/moderate.dm b/code/modules/hallucinations/effects/moderate.dm index 38127101d92..9e197e3ed68 100644 --- a/code/modules/hallucinations/effects/moderate.dm +++ b/code/modules/hallucinations/effects/moderate.dm @@ -437,7 +437,7 @@ * Returns the image to use as override to the target's appearance. */ /obj/effect/hallucination/self_delusion/proc/get_image() - return image('icons/mob/animal.dmi', target, pick("bear", "brownbear", "corgi", "cow", "deer", "goat", "goose", "pig", "blank-body")) + return image('icons/mob/animal.dmi', target, pick("black_bear", "brown_bear", "corgi", "cow", "deer", "goat", "goose", "pig", "blank-body")) /** * # Hallucination - Delusion @@ -466,4 +466,4 @@ * Returns the image to use as override to the target's appearance. */ /obj/effect/hallucination/delusion/proc/get_image(mob/living/carbon/human/H) - return image('icons/mob/animal.dmi', H, pick("bear", "brownbear", "corgi", "cow", "deer", "goat", "goose", "pig", "blank-body")) + return image('icons/mob/animal.dmi', H, pick("black_bear", "brown_bear", "corgi", "cow", "deer", "goat", "goose", "pig", "blank-body")) diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm index 3b045ce67ef..6ed8a93ac38 100644 --- a/code/modules/mob/living/simple_animal/hostile/bear.dm +++ b/code/modules/mob/living/simple_animal/hostile/bear.dm @@ -7,17 +7,17 @@ icon_dead = "bear_dead" icon_gib = "bear_gib" mob_biotypes = MOB_ORGANIC | MOB_BEAST - speak = list("RAWR!","Rawr!","GRR!","Growl!") + speak = list("RAWR!", "Rawr!", "GRR!", "Growl!") speak_emote = list("growls", "roars") - emote_hear = list("rawrs","grumbles","grawls") + emote_hear = list("rawrs", "grumbles", "grawls") emote_see = list("stares ferociously", "stomps") speak_chance = 1 turns_per_move = 5 see_in_dark = 6 butcher_results = list(/obj/item/food/snacks/monstermeat/bearmeat = 5, /obj/item/clothing/head/bearpelt = 1) - response_help = "pets" + response_help = "pets" response_disarm = "gently pushes aside" - response_harm = "hits" + response_harm = "hits" stop_automated_movement_when_pulled = FALSE maxHealth = 60 health = 60 @@ -36,23 +36,41 @@ gold_core_spawnable = HOSTILE_SPAWN footstep_type = FOOTSTEP_MOB_CLAW +/mob/living/simple_animal/hostile/bear/Process_Spacemove(movement_dir = 0) + return TRUE //No drifting in space for space bears! + +/mob/living/simple_animal/hostile/bear/black + name = "black bear" + icon_state = "black_bear" + icon_living = "black_bear" + icon_dead = "black_bear_dead" + butcher_results = list(/obj/item/food/snacks/monstermeat/bearmeat = 5, /obj/item/clothing/head/bearpelt/black = 1) + +/mob/living/simple_animal/hostile/bear/brown + name = "brown bear" + icon_state = "brown_bear" + icon_living = "brown_bear" + icon_dead = "brown_bear_dead" + butcher_results = list(/obj/item/food/snacks/monstermeat/bearmeat = 5, /obj/item/clothing/head/bearpelt/brown = 1) + +/mob/living/simple_animal/hostile/bear/polar + name = "polar bear" + desc = "Found in the most extreme climates, its insides won't protect you from that kind of cold." + icon_state = "polar_bear" + icon_living = "polar_bear" + icon_dead = "polar_bear_dead" + butcher_results = list(/obj/item/food/snacks/monstermeat/bearmeat = 5, /obj/item/clothing/head/bearpelt/polar = 1) + //SPACE BEARS! SQUEEEEEEEE~ OW! FUCK! IT BIT MY HAND OFF!! /mob/living/simple_animal/hostile/bear/Hudson name = "Hudson" desc = "Feared outlaw, this guy is one bad news bear." //I'm sorry... + icon_state = "combat_bear" + icon_living = "combat_bear" + icon_dead = "combat_bear_dead" + butcher_results = list(/obj/item/food/snacks/monstermeat/bearmeat = 5, /obj/item/clothing/head/bearpelt/brown = 1) /mob/living/simple_animal/hostile/bear/Hudson/Initialize(mapload) . = ..() var/unbearable_pun = pick("He's unbearably cute.", "It looks like he is a bearer of bad news.", "Sadly, he is bearly able to comprehend puns.") - desc = "That's Hudson. " + unbearable_pun// I am not sorry for this. - -/mob/living/simple_animal/hostile/bear/Move() - ..() - if(stat != DEAD) - if(loc && isspaceturf(loc)) - icon_state = "bear" - else - icon_state = "bearfloor" - -/mob/living/simple_animal/hostile/bear/Process_Spacemove(movement_dir = 0) - return 1 //No drifting in space for space bears! + desc = "That's Hudson. " + unbearable_pun // I am not sorry for this. diff --git a/code/modules/research/strange_objects.dm b/code/modules/research/strange_objects.dm index 38137e88d1d..21f1a1d467e 100644 --- a/code/modules/research/strange_objects.dm +++ b/code/modules/research/strange_objects.dm @@ -133,7 +133,8 @@ /mob/living/simple_animal/lizard, /mob/living/simple_animal/mouse, /mob/living/simple_animal/pet/dog/pug, - /mob/living/simple_animal/hostile/bear, + /mob/living/simple_animal/hostile/bear/black, + /mob/living/simple_animal/hostile/bear/brown, /mob/living/simple_animal/hostile/poison/bees, /mob/living/simple_animal/hostile/carp ) diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi index 72569afd028..cdc511615e3 100644 Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index e7831943479..c8c13afe615 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/species/vox/head.dmi b/icons/mob/clothing/species/vox/head.dmi index cbf99e636e7..dce4bba0a45 100644 Binary files a/icons/mob/clothing/species/vox/head.dmi and b/icons/mob/clothing/species/vox/head.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 4f327db6928..2a3aa32d723 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index 8f2ec75eec3..3ae424fc5d9 100644 Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ