diff --git a/GainStation13/code/mechanics/infestation.dm b/GainStation13/code/mechanics/infestation.dm index be8a9a8a..2374e9c0 100644 --- a/GainStation13/code/mechanics/infestation.dm +++ b/GainStation13/code/mechanics/infestation.dm @@ -2,9 +2,9 @@ /datum/round_event_control/dessert_infestation name = "Dessert Infestation" typepath = /datum/round_event/dessert_infestation - weight = 5 - max_occurrences = 2 - min_players = 8 + weight = 6 + max_occurrences = 3 + min_players = 6 /datum/round_event/dessert_infestation announceWhen = 100 diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index 3108ea2b..d7c398d1 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -151,3 +151,14 @@ pixel_x = 0 pixel_y = 0 return TRUE + + +//GS13 - a variant of lattice, used for maint wire protection + +/obj/structure/lattice/catwalk/maintenance + name = "maint catwalk" + desc = "This catwalk seems to be placed in maintenance, in order to protect the wires." + anchored = TRUE + density = FALSE + layer = BELOW_OBJ_LAYER + max_integrity = 50 diff --git a/code/modules/events/mice_migration.dm b/code/modules/events/mice_migration.dm index 48a9f004..417ec772 100644 --- a/code/modules/events/mice_migration.dm +++ b/code/modules/events/mice_migration.dm @@ -4,8 +4,8 @@ weight = 10 /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/config/game_options.txt b/config/game_options.txt index fca7da78..86349c6d 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -539,7 +539,7 @@ ARRIVALS_SHUTTLE_DOCK_WINDOW 55 ## How many wirechewing rodents you want to spawn on exposed maintenane wires at the start of the round. You may wish to set this to 0 if you're testing powernets. -MICE_ROUNDSTART 10 +MICE_ROUNDSTART 3 ## If the percentage of players alive (doesn't count conversions) drops below this threshold the emergency shuttle will be forcefully called (provided it can be) #EMERGENCY_SHUTTLE_AUTOCALL_THRESHOLD 0.2 diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index 6c86002d..6b15d4f9 100644 Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index f2146e22..a1ddbe39 100644 Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm index af482fc0..74c892c8 100644 --- a/modular_citadel/code/modules/client/loadout/__donator.dm +++ b/modular_citadel/code/modules/client/loadout/__donator.dm @@ -284,3 +284,15 @@ datum/gear/lyricalpawsring category = SLOT_IN_BACKPACK path = /obj/item/book/granter/spell/fattening/steal ckeywhitelist = list("sonoida", "themrsky", "Not Number") + +/obj/item/clothing/glasses/eyepatch/cabal + name = "Cabal's Eyepatch" + desc = "Vulpine sluts only." + icon_state = "eyepatch_white" + item_state = "eyepatch_white" + +/datum/gear/white_eyepatch + name = "White Eyepatch" + category = SLOT_GLASSES + path = /obj/item/book/granter/spell/fattening/steal + ckeywhitelist = list("spess_lizurd")