shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #26 from sheepishgoat/tweaklandia

Browse Source 
Plentitude of Small Fixes 3: The Return of Tweaks
This commit is contained in:
evilew
2024-11-21 01:06:47 +01:00
committed by GitHub
parent 45ac0b6fd5 b251055c6e
commit 2dd9f92643
55 changed files with 577 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/disease/disease_event.dm
+1 -1
View File
@@ -3,7 +3,7 @@
name = "Spawn Sentient Disease"
typepath = /datum/round_event/ghost_role/sentient_disease
weight = 7
max_occurrences = 1
max_occurrences = 0 //GS13 - removed midround pseudo-antags
min_players = 5
category = EVENT_CATEGORY_HEALTH
description = "Spawns a sentient disease, who wants to infect as many people as possible."
code/modules/antagonists/revenant/revenant_spawn_event.dm
+1 -1
View File
@@ -4,7 +4,7 @@
name = "Spawn Revenant" // Did you mean 'griefghost'?
typepath = /datum/round_event/ghost_role/revenant
weight = 7
max_occurrences = 1
max_occurrences = 0 //GS13 tweak - no antags, thanks
min_players = 5
category = EVENT_CATEGORY_ENTITIES
description = "Spawns an angry, soul sucking ghost."
code/modules/antagonists/slaughter/slaughterevent.dm
+1 -1
View File
@@ -2,7 +2,7 @@
name = "Spawn Slaughter Demon"
typepath = /datum/round_event/ghost_role/slaughter
weight = 1 //Very rare
max_occurrences = 1
max_occurrences = 0 //GS13 - no antags, thanks
earliest_start = 1 HOURS
min_players = 20
category = EVENT_CATEGORY_ENTITIES
code/modules/antagonists/swarmer/swarmer_event.dm
+1 -1
View File
@@ -2,7 +2,7 @@
name = "Spawn Swarmer Shell"
typepath = /datum/round_event/spawn_swarmer
weight = 7
max_occurrences = 1 //Only once okay fam
max_occurrences = 0 //GS13 - no antags, thanks
earliest_start = 30 MINUTES
min_players = 35
dynamic_should_hijack = TRUE
code/modules/awaymissions/corpse.dm
+5 -5
View File
@@ -474,11 +474,11 @@
uniform = /obj/item/clothing/under/pants/youngfolksjeans
id = /obj/item/card/id
/datum/outfit/beachbum/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source)
..()
if(visualsOnly)
return
H.dna.add_mutation(STONER)
// /datum/outfit/beachbum/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source)
// ..()
// if(visualsOnly)
// return
// H.dna.add_mutation(STONER) //GS13 - removes the stoner trait, it makes the role almost unplayable
/////////////////Officers+Nanotrasen Security//////////////////////
code/modules/events/abductor.dm
+1 -1
View File
@@ -2,7 +2,7 @@
name = "Abductors"
typepath = /datum/round_event/ghost_role/abductor
weight = 10
max_occurrences = 1
max_occurrences = 0 //GS13 - no antags, thanks
min_players = 30
dynamic_should_hijack = TRUE
category = EVENT_CATEGORY_INVASION
code/modules/events/alien_infestation.dm
+1 -1
View File
@@ -3,7 +3,7 @@
typepath = /datum/round_event/ghost_role/alien_infestation
weight = 5
min_players = 25
max_occurrences = 1
max_occurrences = 0 //GS13 - no antags, thanks
dynamic_should_hijack = TRUE
category = EVENT_CATEGORY_ENTITIES
description = "A xenomorph larva spawns on a random vent."
code/modules/events/anomaly_bluespace.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/datum/round_event_control/anomaly/anomaly_bluespace
name = "Anomaly: Bluespace"
typepath = /datum/round_event/anomaly/anomaly_bluespace
min_players = 12 //GS13 - higher pop = more likely to be solved instead of wrecking a whole dep
max_occurrences = 1
weight = 5
description = "This anomaly randomly teleports all items and mobs in a large area."
code/modules/events/aurora_caelus.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/datum/round_event_control/aurora_caelus
name = "Aurora Caelus"
typepath = /datum/round_event/aurora_caelus
max_occurrences = 2
max_occurrences = 4 //GS13 - pretty lights, why not
weight = 4
earliest_start = 20 MINUTES
category = EVENT_CATEGORY_FRIENDLY
code/modules/events/high_priority_bounty.dm
+2 -2
View File
@@ -1,9 +1,9 @@
/datum/round_event_control/high_priority_bounty
name = "High Priority Bounty"
typepath = /datum/round_event/high_priority_bounty
max_occurrences = 5
max_occurrences = 6 //GS13 - because why not
weight = 20
earliest_start = 10
earliest_start = 10 MINUTES
category = EVENT_CATEGORY_BUREAUCRATIC
description = "Creates bounties that are three times original worth."
code/modules/events/immovable_rod.dm
+2 -2
View File
@@ -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 = 20 //GS13 - tweaked min players and occurences
max_occurrences = 2
min_players = 25 //GS13 - tweaked min players and occurences
max_occurrences = 1 //GS13 - one is enough as is
var/atom/special_target
category = EVENT_CATEGORY_SPACE
description = "The station passes through an immovable rod."
code/modules/events/ion_storm.dm
+1 -1
View File
@@ -4,7 +4,7 @@
name = "Ion Storm"
typepath = /datum/round_event/ion_storm
weight = 15
min_players = 2
min_players = 5 //GS13 - increasing pop so it's more likely someone has a chance to fix the laws
category = EVENT_CATEGORY_AI
description = "Gives the AI a new, randomized law."
code/modules/events/major_dust.dm
+2 -1
View File
@@ -1,7 +1,8 @@
/datum/round_event_control/meteor_wave/major_dust
name = "Major Space Dust"
typepath = /datum/round_event/meteor_wave/major_dust
min_players = 8 //GS13
min_players = 10 //GS13 - do it when there's more people to fix it around
max_occurrences = 2 //GS13 - limiting the amount of it
weight = 8
description = "The station is pelted by sand."
code/modules/events/meteor_wave.dm
+3 -3
View File
@@ -7,7 +7,7 @@
name = "Meteor Wave: Normal"
typepath = /datum/round_event/meteor_wave
weight = 4
min_players = 16 //GS13 - tweaked all meteor waves to nerf them a bit
min_players = 20 //GS13 - tweaked all meteor waves to nerf them a bit
max_occurrences = 2
earliest_start = 40 MINUTES
category = EVENT_CATEGORY_SPACE
@@ -87,7 +87,7 @@
typepath = /datum/round_event/meteor_wave/threatening
weight = 5
min_players = 20
max_occurrences = 1
max_occurrences = 0 //GS13 - too chaotic
earliest_start = 45 MINUTES
description = "A meteor wave with higher chance of big meteors."
@@ -100,7 +100,7 @@
typepath = /datum/round_event/meteor_wave/catastrophic
weight = 7
min_players = 25
max_occurrences = 1
max_occurrences = 0 //GS13 - too chaotic
earliest_start = 55 MINUTES
description = "A meteor wave that might summon a tunguska class meteor."
code/modules/events/nightmare.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/datum/round_event_control/nightmare
name = "Spawn Nightmare"
typepath = /datum/round_event/ghost_role/nightmare
max_occurrences = 1
max_occurrences = 0 //GS13 - no antags, thanks
min_players = 25
dynamic_should_hijack = TRUE
category = EVENT_CATEGORY_ENTITIES
code/modules/events/operative.dm
+1 -1
View File
@@ -2,7 +2,7 @@
name = "Lone Operative"
typepath = /datum/round_event/ghost_role/operative
weight = 0 //Admin only
max_occurrences = 0 //GS13 tweak
max_occurrences = 0 //GS13 - just in case
category = EVENT_CATEGORY_INVASION
description = "A single nuclear operative assaults the station."
code/modules/events/pirates.dm
+1 -1
View File
@@ -2,7 +2,7 @@
name = "Space Pirates"
typepath = /datum/round_event/pirates
weight = 8
max_occurrences = 1
max_occurrences = 0 //GS13 - no antags, thanks
min_players = 20
earliest_start = 50 MINUTES
dynamic_should_hijack = TRUE
code/modules/events/portal_storm.dm
+1
View File
@@ -3,6 +3,7 @@
typepath = /datum/round_event/portal_storm/syndicate_shocktroop
weight = 2
min_players = 20
max_occurrences = 0 //GS13 - no antags, thanks
earliest_start = 60 MINUTES
category = EVENT_CATEGORY_ENTITIES
description = "Syndicate troops pour out of portals."
code/modules/events/space_dragon.dm
+1 -1
View File
@@ -2,7 +2,7 @@
name = "Spawn Space Dragon"
typepath = /datum/round_event/ghost_role/space_dragon
weight = 8
max_occurrences = 1
max_occurrences = 0 //GS13 - no antags, thanks
min_players = 25
dynamic_should_hijack = TRUE
category = EVENT_CATEGORY_ENTITIES
code/modules/events/space_ninja.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/datum/round_event_control/space_ninja
name = "Spawn Space Ninja"
typepath = /datum/round_event/ghost_role/space_ninja
max_occurrences = 1
max_occurrences = 0 //GS13 - no antags, thanks
weight = 10
earliest_start = 20 MINUTES
min_players = 25
code/modules/events/spacevine.dm
+1 -1
View File
@@ -3,7 +3,7 @@
typepath = /datum/round_event/spacevine
weight = 15
max_occurrences = 3
min_players = 18
min_players = 15 //GS13 - should be enough players
category = EVENT_CATEGORY_ENTITIES
description = "Kudzu begins to overtake the station. Might spawn man-traps."
code/modules/events/stray_cargo.dm
+1 -1
View File
@@ -3,7 +3,7 @@
name = "Stray Cargo Pod"
typepath = /datum/round_event/stray_cargo
weight = 5
max_occurrences = 6
max_occurrences = 6 //GS13 - increase the amount of possible strays
earliest_start = 10 MINUTES
category = EVENT_CATEGORY_BUREAUCRATIC
description = "A pod containing a random supply crate lands on the station."
code/modules/events/supernova.dm
+1 -1
View File
@@ -2,7 +2,7 @@
name = "Supernova"
typepath = /datum/round_event/supernova
weight = 5
max_occurrences = 0
max_occurrences = 0 //GS13 - fuck no (this is just more intense radstorm)
min_players = 2
category = EVENT_CATEGORY_SPACE
description = "Several modified radstorms hit the station."
code/modules/events/travelling_trader.dm
+1 -1
View File
@@ -2,7 +2,7 @@
name = "Travelling Trader"
typepath = /datum/round_event/travelling_trader
weight = 8
max_occurrences = 6 //GS13 because why not
max_occurrences = 6 //GS13 - more occurences, 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."
code/modules/events/untie_shoes.dm
+1 -1
View File
@@ -2,7 +2,7 @@
name = "Untied Shoes"
typepath = /datum/round_event/untied_shoes
weight = 50
max_occurrences = 10
max_occurrences = 0 //GS13 - tedious, doesn't always make sense
alert_observers = FALSE
category = EVENT_CATEGORY_HEALTH
description = "Unties people's shoes, with a chance to knot them as well."
code/modules/events/vent_clog.dm
+2 -2
View File
@@ -2,8 +2,8 @@
name = "Clogged Vents: Normal"
typepath = /datum/round_event/vent_clog
weight = 10
max_occurrences = 3
min_players = 10
max_occurrences = 2 //GS13 - pain in the ass, occurences nerfed until a less disruptive variant is made
min_players = 16 //GS13 - pain in the ass, occurences nerfed until a less disruptive variant is made
category = EVENT_CATEGORY_HEALTH
description = "All the scrubbers onstation spit random chemicals in smoke form."
code/modules/jobs/job_types/prisoner.dm
+2 -2
View File
@@ -4,8 +4,8 @@
department_head = list("The Security Team")
department_flag = CIVILIAN
faction = "Station"
total_positions = 0
spawn_positions = 0
total_positions = 1 //GS13 - enabling prisoner (for now)
spawn_positions = 1 //GS13 - enabling prisoner (for now)
supervisors = "the security team"
random_spawns_possible = FALSE
code/modules/mining/equipment/explorer_gear.dm
+2 -2
View File
@@ -168,7 +168,7 @@
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
hoodtype = /obj/item/clothing/head/hooded/explorer/heva
armor = list(MELEE = 20, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 20, BIO = 100, RAD = 80, FIRE = 100, ACID = 80)
resistance_flags = FIRE_PROOF | GOLIATH_WEAKNESS
resistance_flags = FIRE_PROOF
/obj/item/clothing/head/hooded/explorer/heva
name = "HEVA hood"
@@ -178,7 +178,7 @@
item_state = "heva"
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
armor = list(MELEE = 20, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 20, BIO = 100, RAD = 20, FIRE = 60, ACID = 20)
resistance_flags = FIRE_PROOF | GOLIATH_WEAKNESS
resistance_flags = FIRE_PROOF
/obj/item/clothing/head/hooded/explorer/heva/equipped(mob/living/carbon/human/user, slot)
..()
code/modules/mob/living/simple_animal/gremlin/gremlin_event.dm
+1 -1
View File
@@ -4,7 +4,7 @@
weight = 15
max_occurrences = 2
earliest_start = 20 MINUTES
min_players = 5
min_players = 8 //GS13 - really annoying on low-lowpop considering they jolt back and forth
category = EVENT_CATEGORY_ENTITIES
description = "Annoying little creatures go around the station causing havoc and hacking everything."
code/modules/mob/living/simple_animal/hostile/bees.dm
+3 -3
View File
@@ -15,7 +15,7 @@
desc = "Buzzy buzzy bee, stingy sti- Ouch!"
icon_state = ""
icon_living = ""
icon = 'icons/mob/bees.dmi'
icon = 'GainStation13/icons/mob/bees.dmi' //GS13 sprite change - brings back smaller bees rather than big goofy ones
gender = FEMALE
speak_emote = list("buzzes")
emote_hear = list("buzzes")
@@ -100,7 +100,7 @@
add_overlay("[icon_base]_base")
var/static/mutable_appearance/greyscale_overlay
greyscale_overlay = greyscale_overlay || mutable_appearance('icons/mob/bees.dmi')
greyscale_overlay = greyscale_overlay || mutable_appearance('GainStation13/icons/mob/bees.dmi') //GS13 sprite change - brings back smaller bees rather than big goofy ones
greyscale_overlay.icon_state = "[icon_base]_grey"
greyscale_overlay.color = col
add_overlay(greyscale_overlay)
@@ -255,7 +255,7 @@
desc = "She's the queen of bees, BZZ BZZ!"
icon_state = "queen_item"
item_state = ""
icon = 'icons/mob/bees.dmi'
icon = 'GainStation13/icons/mob/bees.dmi' //GS13 sprite change - brings back smaller bees rather than big goofy ones
var/mob/living/simple_animal/hostile/poison/bees/queen/queen
code/modules/power/lighting.dm
+5 -5
View File
@@ -14,7 +14,7 @@
/obj/item/wallframe/light_fixture
name = "light fixture frame"
desc = "Used for building lights."
icon = 'icons/obj/lighting.dmi'
icon = 'GainStation13/icons/obj/lighting.dmi' //GS13 - sprite change
icon_state = "tube-construct-item"
result_path = /obj/structure/light_construct
inverse = TRUE
@@ -38,7 +38,7 @@
/obj/structure/light_construct
name = "light fixture frame"
desc = "A light fixture under construction."
icon = 'icons/obj/lighting.dmi'
icon = 'GainStation13/icons/obj/lighting.dmi' //GS13 - sprite change
icon_state = "tube-construct-stage1"
anchored = TRUE
layer = WALL_OBJ_LAYER
@@ -178,7 +178,7 @@
// the standard tube light fixture
/obj/machinery/light
name = "light fixture"
icon = 'icons/obj/lighting.dmi'
icon = 'GainStation13/icons/obj/lighting.dmi' //GS13 - sprite change
var/overlayicon = 'icons/obj/lighting_overlay.dmi'
var/base_state = "tube" // base description and icon_state
icon_state = "tube"
@@ -733,7 +733,7 @@
// will fit into empty /obj/machinery/light of the corresponding type
/obj/item/light
icon = 'icons/obj/lighting.dmi'
icon = 'GainStation13/icons/obj/lighting.dmi' //GS13 - sprite change
force = 2
throwforce = 5
w_class = WEIGHT_CLASS_TINY
@@ -839,7 +839,7 @@
/obj/machinery/light/floor
name = "floor light"
icon = 'icons/obj/lighting.dmi'
icon = 'GainStation13/icons/obj/lighting.dmi' //GS13 - sprite change
base_state = "floor" // base description and icon_state
icon_state = "floor"
brightness = 5