diff --git a/GainStation13/icons/effects/atmospherics.dmi b/GainStation13/icons/effects/atmospherics.dmi new file mode 100644 index 0000000000..16884f1da2 Binary files /dev/null and b/GainStation13/icons/effects/atmospherics.dmi differ 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