From 795325d786dbfc81d0ac6eaf70ba0d4b74921549 Mon Sep 17 00:00:00 2001 From: evilew Date: Wed, 30 Oct 2024 11:36:06 +0100 Subject: [PATCH] more tweaks - brought over better glitter sprites - nerfed bear object dmg - removed brand intelligence from the pool - nerfed mice migration spawns --- GainStation13/icons/effects/atmospherics.dmi | Bin 0 -> 19439 bytes .../objects/effects/decals/cleanable/misc.dm | 10 +++++----- code/modules/events/brand_intelligence.dm | 2 +- code/modules/events/mice_migration.dm | 4 ++-- .../mob/living/simple_animal/hostile/bear.dm | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 GainStation13/icons/effects/atmospherics.dmi diff --git a/GainStation13/icons/effects/atmospherics.dmi b/GainStation13/icons/effects/atmospherics.dmi new file mode 100644 index 0000000000000000000000000000000000000000..16884f1da2c41236fe62b54c28f302ed98d23277 GIT binary patch literal 19439 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 literal 0 HcmV?d00001 diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm index 7033284a86..933ca0b1f8 100644 --- a/code/game/objects/effects/decals/cleanable/misc.dm +++ b/code/game/objects/effects/decals/cleanable/misc.dm @@ -277,25 +277,25 @@ icon_state = "salt_pile" gender = NEUTER -/obj/effect/decal/cleanable/glitter +/obj/effect/decal/cleanable/glitter //GS13 - changed glitters to more subtle variants name = "generic glitter pile" desc = "The herpes of arts and crafts." - icon = 'icons/effects/atmospherics.dmi' + icon = 'GainStation13/icons/effects/atmospherics.dmi' + icon_state = "glitter" gender = NEUTER mergeable_decal = TRUE persistent = FALSE /obj/effect/decal/cleanable/glitter/pink name = "pink glitter" - icon_state = "plasma_old" + color = "#9e0089" /obj/effect/decal/cleanable/glitter/white name = "white glitter" - icon_state = "nitrous_oxide_old" /obj/effect/decal/cleanable/glitter/blue name = "blue glitter" - icon_state = "freon_old" + color = "#2dd6ff" /obj/effect/decal/cleanable/plasma name = "stabilized plasma" diff --git a/code/modules/events/brand_intelligence.dm b/code/modules/events/brand_intelligence.dm index cab9daaa55..dbbb0c01b1 100644 --- a/code/modules/events/brand_intelligence.dm +++ b/code/modules/events/brand_intelligence.dm @@ -4,7 +4,7 @@ weight = 5 min_players = 15 - max_occurrences = 1 + max_occurrences = 0 category = EVENT_CATEGORY_AI description = "Vending machines will attack people until the Patient Zero is disabled." diff --git a/code/modules/events/mice_migration.dm b/code/modules/events/mice_migration.dm index 5bf842ba47..ccc6affd11 100644 --- a/code/modules/events/mice_migration.dm +++ b/code/modules/events/mice_migration.dm @@ -6,8 +6,8 @@ description = "A horde of mice arrives, and perhaps even the Rat King themselves." /datum/round_event/mice_migration - var/minimum_mice = 5 - var/maximum_mice = 15 + var/minimum_mice = 3 + var/maximum_mice = 8 /datum/round_event/mice_migration/announce(fake) var/cause = pick("space-winter", "budget-cuts", "Ragnarok", diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm index adca93e70f..7be9d099a9 100644 --- a/code/modules/mob/living/simple_animal/hostile/bear.dm +++ b/code/modules/mob/living/simple_animal/hostile/bear.dm @@ -27,7 +27,7 @@ spacewalk = TRUE var/armored = FALSE - obj_damage = 60 + obj_damage = 20 melee_damage_lower = 15 // i know it's like half what it used to be, but bears cause bleeding like crazy now so it works out melee_damage_upper = 15 wound_bonus = -5