diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 8ea36dfe0d..cf81e47337 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -837,13 +837,12 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "

Belly

" dat += "[features["has_belly"] == TRUE ? "Yes" : "No"]" if(features["has_belly"]) - dat += "Belly Size: [features["belly_size"]]" + dat += "Color:
" if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE) - dat += "Color:
" - dat += "   (Skin tone overriding)
" + dat += "[SKINTONE2HEX(skin_tone)](Skin tone overriding)
" else - dat += "Color:
" - dat += "    Change
" + dat += "#[features["belly_color"]] Change
" + dat += "Belly Size: [features["belly_size"]]" dat += "Belly Visibility:[features["belly_visibility"]]" // GS13: tweak inflation description dat += "Inflation (climax with and manual belly size change in arousal menu):[features["inflatable_belly"] == 1 ? "Yes" : "No"]" @@ -2730,7 +2729,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(new_bellycolor == "#000000") features["belly_color"] = pref_species.default_color else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3]) - features["belly_color"] = sanitize_hexcolor(new_bellycolor) + features["belly_color"] = sanitize_hexcolor(new_bellycolor, 6) else to_chat(user,"Invalid color. Your color is not bright enough.") diff --git a/code/modules/events/anomaly_flux.dm b/code/modules/events/anomaly_flux.dm index d3b1e8ea7e..cfb5889e4f 100644 --- a/code/modules/events/anomaly_flux.dm +++ b/code/modules/events/anomaly_flux.dm @@ -1,8 +1,8 @@ /datum/round_event_control/anomaly/anomaly_flux name = "Anomaly: Hyper-Energetic Flux" typepath = /datum/round_event/anomaly/anomaly_flux - - max_occurrences = 5 + min_players = 20 + max_occurrences = 0 //GS13 - this event ends poorly 90% of the time weight = 20 description = "This anomaly shocks and explodes." diff --git a/code/modules/events/anomaly_grav.dm b/code/modules/events/anomaly_grav.dm index 232d2ddd35..a5424ee900 100644 --- a/code/modules/events/anomaly_grav.dm +++ b/code/modules/events/anomaly_grav.dm @@ -1,7 +1,7 @@ /datum/round_event_control/anomaly/anomaly_grav name = "Anomaly: Gravitational" typepath = /datum/round_event/anomaly/anomaly_grav - + min_players = 4 //GS13 - mostly harmless anomaly max_occurrences = 5 weight = 20 description = "This anomaly throws things around." diff --git a/code/modules/events/anomaly_pyro.dm b/code/modules/events/anomaly_pyro.dm index dee0330743..a7758a591a 100644 --- a/code/modules/events/anomaly_pyro.dm +++ b/code/modules/events/anomaly_pyro.dm @@ -2,7 +2,7 @@ name = "Anomaly: Pyroclastic" typepath = /datum/round_event/anomaly/anomaly_pyro - min_players = 5 + min_players = 10 //GS13 tweak max_occurrences = 5 weight = 20 description = "This anomaly sets things on fire, and creates a pyroclastic slime." diff --git a/code/modules/events/aurora_caelus.dm b/code/modules/events/aurora_caelus.dm index 63d7122cb8..d9e1e25345 100644 --- a/code/modules/events/aurora_caelus.dm +++ b/code/modules/events/aurora_caelus.dm @@ -1,9 +1,9 @@ /datum/round_event_control/aurora_caelus name = "Aurora Caelus" typepath = /datum/round_event/aurora_caelus - max_occurrences = 1 + max_occurrences = 2 weight = 4 - earliest_start = 5 MINUTES + earliest_start = 20 MINUTES category = EVENT_CATEGORY_FRIENDLY description = "A colourful display can be seen through select windows. And the kitchen." diff --git a/code/modules/events/blob.dm b/code/modules/events/blob.dm index e43ce0d4d0..298d40a54e 100644 --- a/code/modules/events/blob.dm +++ b/code/modules/events/blob.dm @@ -2,7 +2,7 @@ name = "Blob" typepath = /datum/round_event/ghost_role/blob weight = 10 - max_occurrences = 1 + max_occurrences = 0 //GS13 - let's not earliest_start = 40 MINUTES min_players = 35 diff --git a/code/modules/events/brain_trauma.dm b/code/modules/events/brain_trauma.dm index 85d69a1509..11170bb2ed 100644 --- a/code/modules/events/brain_trauma.dm +++ b/code/modules/events/brain_trauma.dm @@ -2,7 +2,7 @@ name = "Spontaneous Brain Trauma" typepath = /datum/round_event/brain_trauma weight = 25 - min_players = 5 + min_players = 8 //GS13 - somewhat harmless ig category = EVENT_CATEGORY_HEALTH description = "A crewmember gains a random trauma." diff --git a/code/modules/events/carp_migration.dm b/code/modules/events/carp_migration.dm index bed6cf84ea..a1d435e919 100644 --- a/code/modules/events/carp_migration.dm +++ b/code/modules/events/carp_migration.dm @@ -2,9 +2,9 @@ name = "Carp Migration" typepath = /datum/round_event/carp_migration weight = 15 - min_players = 2 - earliest_start = 10 MINUTES - max_occurrences = 6 + min_players = 5 //GS13 - tweaked player count, earlier start and max occurences, to fit lowpop better + earliest_start = 20 MINUTES + max_occurrences = 4 category = EVENT_CATEGORY_ENTITIES description = "Summons a school of space carp." diff --git a/code/modules/events/cat_surgeon.dm b/code/modules/events/cat_surgeon.dm index 254fdaecca..3c7c98fbcd 100644 --- a/code/modules/events/cat_surgeon.dm +++ b/code/modules/events/cat_surgeon.dm @@ -1,7 +1,7 @@ /datum/round_event_control/cat_surgeon name = "Cat Surgeon" typepath = /datum/round_event/cat_surgeon - max_occurrences = 1 + max_occurrences = 0 //GS13 - this one's just cruel lmao weight = 5 category = EVENT_CATEGORY_ENTITIES description = "Spawns a crazy surgeon ready to perverse things with the crew." diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm index 753349fdd6..fc9031fc6a 100644 --- a/code/modules/events/disease_outbreak.dm +++ b/code/modules/events/disease_outbreak.dm @@ -1,8 +1,8 @@ /datum/round_event_control/disease_outbreak name = "Disease Outbreak" typepath = /datum/round_event/disease_outbreak - max_occurrences = 1 - min_players = 3 + max_occurrences = 3 + min_players = 5 weight = 5 category = EVENT_CATEGORY_HEALTH description = "A classic or advanced disease will infect some crewmembers." diff --git a/code/modules/events/dust.dm b/code/modules/events/dust.dm index 6b0139c449..85b695db02 100644 --- a/code/modules/events/dust.dm +++ b/code/modules/events/dust.dm @@ -2,7 +2,7 @@ name = "Minor Space Dust" typepath = /datum/round_event/space_dust weight = 200 - max_occurrences = 1000 + max_occurrences = 15 //GS13 - it was originaly 1000 occurences, which won't work out well in our super long rounds earliest_start = 0 MINUTES alert_observers = FALSE category = EVENT_CATEGORY_SPACE @@ -21,7 +21,7 @@ typepath = /datum/round_event/sandstorm weight = 5 max_occurrences = 1 - min_players = 10 + min_players = 20 earliest_start = 20 MINUTES category = EVENT_CATEGORY_SPACE description = "The station is pelted by an extreme amount of sand for several minutes." diff --git a/code/modules/events/electrical_storm.dm b/code/modules/events/electrical_storm.dm index f04389b1a1..19927b9bd6 100644 --- a/code/modules/events/electrical_storm.dm +++ b/code/modules/events/electrical_storm.dm @@ -1,7 +1,7 @@ /datum/round_event_control/electrical_storm name = "Electrical Storm" typepath = /datum/round_event/electrical_storm - earliest_start = 10 MINUTES + earliest_start = 20 MINUTES min_players = 5 weight = 40 category = EVENT_CATEGORY_ENGINEERING diff --git a/code/modules/events/heart_attack.dm b/code/modules/events/heart_attack.dm index 4f94576fa6..23837bc529 100644 --- a/code/modules/events/heart_attack.dm +++ b/code/modules/events/heart_attack.dm @@ -2,8 +2,8 @@ name = "Random Heart Attack" typepath = /datum/round_event/heart_attack weight = 10 - max_occurrences = 2 - min_players = 10 // To avoid shafting lowpop + max_occurrences = 0 //GS13 - let's turn this off for now + min_players = 16 // To avoid shafting lowpop category = EVENT_CATEGORY_HEALTH description = "A random crewmember's heart gives out." diff --git a/code/modules/events/high_priority_bounty.dm b/code/modules/events/high_priority_bounty.dm index 90f27b19f9..da3bb8fa3d 100644 --- a/code/modules/events/high_priority_bounty.dm +++ b/code/modules/events/high_priority_bounty.dm @@ -1,7 +1,7 @@ /datum/round_event_control/high_priority_bounty name = "High Priority Bounty" typepath = /datum/round_event/high_priority_bounty - max_occurrences = 3 + max_occurrences = 5 weight = 20 earliest_start = 10 category = EVENT_CATEGORY_BUREAUCRATIC diff --git a/code/modules/events/immovable_rod.dm b/code/modules/events/immovable_rod.dm index 525b49ba6a..70b92d071d 100644 --- a/code/modules/events/immovable_rod.dm +++ b/code/modules/events/immovable_rod.dm @@ -10,8 +10,8 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 /datum/round_event_control/immovable_rod name = "Immovable Rod" typepath = /datum/round_event/immovable_rod - min_players = 15 - max_occurrences = 5 + min_players = 20 //GS13 - tweaked min players and occurences + max_occurrences = 2 var/atom/special_target category = EVENT_CATEGORY_SPACE description = "The station passes through an immovable rod." diff --git a/code/modules/events/major_dust.dm b/code/modules/events/major_dust.dm index dc24a52b19..9ae5b8939e 100644 --- a/code/modules/events/major_dust.dm +++ b/code/modules/events/major_dust.dm @@ -1,6 +1,7 @@ /datum/round_event_control/meteor_wave/major_dust name = "Major Space Dust" typepath = /datum/round_event/meteor_wave/major_dust + min_players = 8 //GS13 weight = 8 description = "The station is pelted by sand." diff --git a/code/modules/events/meteor_wave.dm b/code/modules/events/meteor_wave.dm index a3534be3ea..42a122cc08 100644 --- a/code/modules/events/meteor_wave.dm +++ b/code/modules/events/meteor_wave.dm @@ -7,9 +7,9 @@ name = "Meteor Wave: Normal" typepath = /datum/round_event/meteor_wave weight = 4 - min_players = 15 - max_occurrences = 3 - earliest_start = 25 MINUTES + min_players = 16 //GS13 - tweaked all meteor waves to nerf them a bit + max_occurrences = 2 + earliest_start = 40 MINUTES category = EVENT_CATEGORY_SPACE description = "A regular meteor wave." @@ -87,8 +87,8 @@ typepath = /datum/round_event/meteor_wave/threatening weight = 5 min_players = 20 - max_occurrences = 3 - earliest_start = 35 MINUTES + max_occurrences = 1 + earliest_start = 45 MINUTES description = "A meteor wave with higher chance of big meteors." /datum/round_event/meteor_wave/threatening @@ -100,8 +100,8 @@ typepath = /datum/round_event/meteor_wave/catastrophic weight = 7 min_players = 25 - max_occurrences = 3 - earliest_start = 45 MINUTES + max_occurrences = 1 + earliest_start = 55 MINUTES description = "A meteor wave that might summon a tunguska class meteor." /datum/round_event/meteor_wave/catastrophic diff --git a/code/modules/events/nightmare.dm b/code/modules/events/nightmare.dm index 71351d85be..a1cc9c9029 100644 --- a/code/modules/events/nightmare.dm +++ b/code/modules/events/nightmare.dm @@ -2,7 +2,7 @@ name = "Spawn Nightmare" typepath = /datum/round_event/ghost_role/nightmare max_occurrences = 1 - min_players = 20 + min_players = 25 dynamic_should_hijack = TRUE category = EVENT_CATEGORY_ENTITIES description = "Spawns a nightmare, aiming to darken the station." diff --git a/code/modules/events/operative.dm b/code/modules/events/operative.dm index cbefa58c7b..53b79a9456 100644 --- a/code/modules/events/operative.dm +++ b/code/modules/events/operative.dm @@ -2,7 +2,7 @@ name = "Lone Operative" typepath = /datum/round_event/ghost_role/operative weight = 0 //Admin only - max_occurrences = 1 + max_occurrences = 0 //GS13 tweak category = EVENT_CATEGORY_INVASION description = "A single nuclear operative assaults the station." diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm index 266cb3f0ac..3266bb70bf 100644 --- a/code/modules/events/pirates.dm +++ b/code/modules/events/pirates.dm @@ -3,8 +3,8 @@ typepath = /datum/round_event/pirates weight = 8 max_occurrences = 1 - min_players = 10 - earliest_start = 30 MINUTES + min_players = 20 + earliest_start = 50 MINUTES dynamic_should_hijack = TRUE category = EVENT_CATEGORY_INVASION description = "The crew will either pay up, or face a pirate assault." diff --git a/code/modules/events/portal_storm.dm b/code/modules/events/portal_storm.dm index 49e60893f3..1628566557 100644 --- a/code/modules/events/portal_storm.dm +++ b/code/modules/events/portal_storm.dm @@ -2,8 +2,8 @@ name = "Portal Storm: Syndicate Shocktroops" typepath = /datum/round_event/portal_storm/syndicate_shocktroop weight = 2 - min_players = 15 - earliest_start = 30 MINUTES + min_players = 20 + earliest_start = 60 MINUTES category = EVENT_CATEGORY_ENTITIES description = "Syndicate troops pour out of portals." diff --git a/code/modules/events/prison_break.dm b/code/modules/events/prison_break.dm index 110ab745a0..e49e699338 100644 --- a/code/modules/events/prison_break.dm +++ b/code/modules/events/prison_break.dm @@ -2,7 +2,7 @@ name = "Grey Tide" typepath = /datum/round_event/grey_tide max_occurrences = 2 - min_players = 5 + min_players = 12 category = EVENT_CATEGORY_ENGINEERING description = "Bolts open all doors in one or more departments." diff --git a/code/modules/events/radiation_storm.dm b/code/modules/events/radiation_storm.dm index 5ba3d017e1..2973a6b642 100644 --- a/code/modules/events/radiation_storm.dm +++ b/code/modules/events/radiation_storm.dm @@ -1,7 +1,7 @@ /datum/round_event_control/radiation_storm name = "Radiation Storm" typepath = /datum/round_event/radiation_storm - max_occurrences = 1 + max_occurrences = 0 //GS13 - removed because it disrupts RPs too much category = EVENT_CATEGORY_SPACE description = "Radiation storm affects the station, forcing the crew to escape to maintenance." diff --git a/code/modules/events/shuttle_loan.dm b/code/modules/events/shuttle_loan.dm index 49a0f94000..7de9629530 100644 --- a/code/modules/events/shuttle_loan.dm +++ b/code/modules/events/shuttle_loan.dm @@ -11,8 +11,8 @@ /datum/round_event_control/shuttle_loan name = "Shuttle Loan" typepath = /datum/round_event/shuttle_loan - max_occurrences = 1 - earliest_start = 7 MINUTES + max_occurrences = 3 + earliest_start = 15 MINUTES category = EVENT_CATEGORY_BUREAUCRATIC description = "If cargo accepts the offer, fills the shuttle with loot and/or enemies." diff --git a/code/modules/events/space_dragon.dm b/code/modules/events/space_dragon.dm index 9298767a42..50d7433f4c 100644 --- a/code/modules/events/space_dragon.dm +++ b/code/modules/events/space_dragon.dm @@ -3,7 +3,7 @@ typepath = /datum/round_event/ghost_role/space_dragon weight = 8 max_occurrences = 1 - min_players = 20 + min_players = 25 dynamic_should_hijack = TRUE category = EVENT_CATEGORY_ENTITIES description = "Spawns a space dragon, which will try to take over the station." diff --git a/code/modules/events/space_ninja.dm b/code/modules/events/space_ninja.dm index 6f4564cb63..5fd019fa56 100644 --- a/code/modules/events/space_ninja.dm +++ b/code/modules/events/space_ninja.dm @@ -4,7 +4,7 @@ max_occurrences = 1 weight = 10 earliest_start = 20 MINUTES - min_players = 15 + min_players = 25 dynamic_should_hijack = TRUE category = EVENT_CATEGORY_INVASION description = "A space ninja infiltrates the station." diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 0861ea7caa..9c68add145 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -3,7 +3,7 @@ typepath = /datum/round_event/spacevine weight = 15 max_occurrences = 3 - min_players = 20 + min_players = 18 category = EVENT_CATEGORY_ENTITIES description = "Kudzu begins to overtake the station. Might spawn man-traps." diff --git a/code/modules/events/spider_infestation.dm b/code/modules/events/spider_infestation.dm index 6e8c29d3a9..51a95811fc 100644 --- a/code/modules/events/spider_infestation.dm +++ b/code/modules/events/spider_infestation.dm @@ -2,7 +2,7 @@ name = "Spider Infestation" typepath = /datum/round_event/spider_infestation weight = 5 - max_occurrences = 1 + max_occurrences = 2 min_players = 15 category = EVENT_CATEGORY_ENTITIES description = "Spawns spider eggs, ready to hatch." diff --git a/code/modules/events/spontaneous_appendicitis.dm b/code/modules/events/spontaneous_appendicitis.dm index 31b14bb8b9..bab8797eb4 100644 --- a/code/modules/events/spontaneous_appendicitis.dm +++ b/code/modules/events/spontaneous_appendicitis.dm @@ -2,7 +2,7 @@ name = "Spontaneous Appendicitis" typepath = /datum/round_event/spontaneous_appendicitis weight = 20 - max_occurrences = 4 + max_occurrences = 0 //GS13 - a bit too disruptive for people who wanna RP in peace earliest_start = 10 MINUTES min_players = 5 // To make your chance of getting help a bit higher. category = EVENT_CATEGORY_HEALTH diff --git a/code/modules/events/stray_cargo.dm b/code/modules/events/stray_cargo.dm index f7240f9e8b..e77602d71e 100644 --- a/code/modules/events/stray_cargo.dm +++ b/code/modules/events/stray_cargo.dm @@ -3,7 +3,7 @@ name = "Stray Cargo Pod" typepath = /datum/round_event/stray_cargo weight = 5 - max_occurrences = 4 + max_occurrences = 6 earliest_start = 10 MINUTES category = EVENT_CATEGORY_BUREAUCRATIC description = "A pod containing a random supply crate lands on the station." diff --git a/code/modules/events/supermatter_surge.dm b/code/modules/events/supermatter_surge.dm index 08deaae7d5..1a40c8a7ce 100644 --- a/code/modules/events/supermatter_surge.dm +++ b/code/modules/events/supermatter_surge.dm @@ -2,8 +2,8 @@ name = "Supermatter Surge" typepath = /datum/round_event/supermatter_surge weight = 20 - max_occurrences = 5 - earliest_start = 10 MINUTES + max_occurrences = 0 //GS13 - engineering isn't always omni present here due to lowpop + earliest_start = 40 MINUTES category = EVENT_CATEGORY_ENGINEERING description = "Randomly modifies the supermatter's power, giving the engineers a lot of headaches." diff --git a/code/modules/events/travelling_trader.dm b/code/modules/events/travelling_trader.dm index ac9d103f5f..98ff3184ae 100644 --- a/code/modules/events/travelling_trader.dm +++ b/code/modules/events/travelling_trader.dm @@ -2,8 +2,8 @@ name = "Travelling Trader" typepath = /datum/round_event/travelling_trader weight = 8 - max_occurrences = 2 - earliest_start = 0 MINUTES + max_occurrences = 6 //GS13 because why not + earliest_start = 10 MINUTES category = EVENT_CATEGORY_FRIENDLY description = "A mysterious figure requests something to the crew and rewards them with something for getting it done." diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm index fb88f81598..e42594fd96 100644 --- a/code/modules/events/vent_clog.dm +++ b/code/modules/events/vent_clog.dm @@ -3,6 +3,7 @@ typepath = /datum/round_event/vent_clog weight = 10 max_occurrences = 3 + min_players = 10 category = EVENT_CATEGORY_HEALTH description = "All the scrubbers onstation spit random chemicals in smoke form." @@ -14,10 +15,9 @@ var/list/vents = list() var/randomProbability = 0 var/reagentsAmount = 100 - var/list/saferChems = list( + var/list/saferChems = list( //GS13 - removed some of those chems, just a couple particularly annoying ones /datum/reagent/water, /datum/reagent/carbon, - /datum/reagent/consumable/flour, /datum/reagent/space_cleaner, /datum/reagent/consumable/nutriment, /datum/reagent/consumable/condensedcapsaicin, @@ -25,11 +25,9 @@ /datum/reagent/lube, /datum/reagent/glitter/pink, /datum/reagent/cryptobiolin, - /datum/reagent/toxin/plantbgone, /datum/reagent/blood, /datum/reagent/medicine/charcoal, /datum/reagent/drug/space_drugs, - /datum/reagent/medicine/morphine, /datum/reagent/water/holywater, /datum/reagent/consumable/ethanol, /datum/reagent/consumable/hot_coco, @@ -107,14 +105,14 @@ name = "Clogged Vents: Threatening" typepath = /datum/round_event/vent_clog/threatening weight = 4 - min_players = 15 + min_players = 18 max_occurrences = 1 earliest_start = 35 MINUTES description = "Extra dangerous chemicals come out of the scrubbers." /datum/round_event/vent_clog/threatening randomProbability = 10 - reagentsAmount = 200 + reagentsAmount = 100 /datum/round_event_control/vent_clog/catastrophic name = "Clogged Vents: Catastrophic" diff --git a/code/modules/events/wisdomcow.dm b/code/modules/events/wisdomcow.dm index 3c03911d1d..a591e9d0f2 100644 --- a/code/modules/events/wisdomcow.dm +++ b/code/modules/events/wisdomcow.dm @@ -1,7 +1,7 @@ /datum/round_event_control/wisdomcow name = "Wisdom cow" typepath = /datum/round_event/wisdomcow - max_occurrences = 1 + max_occurrences = 2 weight = 10 category = EVENT_CATEGORY_FRIENDLY description = "A cow appears to tell you wise words." diff --git a/code/modules/events/wormholes.dm b/code/modules/events/wormholes.dm index 413658e34d..ef2206724c 100644 --- a/code/modules/events/wormholes.dm +++ b/code/modules/events/wormholes.dm @@ -3,7 +3,7 @@ typepath = /datum/round_event/wormholes max_occurrences = 3 weight = 2 - min_players = 2 + min_players = 8 category = EVENT_CATEGORY_SPACE description = "Space time anomalies appear on the station, randomly teleporting people who walk into them."