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

Merge branch 'master' into gatofication2

Browse Source
This commit is contained in:
evilew
2024-11-21 22:11:24 +01:00
committed by GitHub
parent 4518a0b016 2dd9f92643
commit 9d9f805d7b
193 changed files with 4649 additions and 708 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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/anomaly_pyro.dm
+2 -2
View File
@@ -2,8 +2,8 @@
name = "Anomaly: Pyroclastic"
typepath = /datum/round_event/anomaly/anomaly_pyro
min_players = 10 //GS13 tweak
max_occurrences = 0
min_players = 10 //GS13 Edit: tweak
max_occurrences = 0 //GS13 Edit: Disabling this for now.
weight = 20
description = "This anomaly sets things on fire, and creates a pyroclastic slime."
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/brain_trauma.dm
+2 -2
View File
@@ -2,8 +2,8 @@
name = "Spontaneous Brain Trauma"
typepath = /datum/round_event/brain_trauma
weight = 25
min_players = 20 //GS13 - somewhat harmless ig
max_occurrences = 0
min_players = 20 //GS13 Edit: 8 to 20. You cant really fix this on your own if you arnt medical.
max_occurrences = 0 //GS13 Edit: Disabling this.
category = EVENT_CATEGORY_HEALTH
description = "A crewmember gains a random trauma."
code/modules/events/brand_intelligence.dm
+1 -1
View File
@@ -4,7 +4,7 @@
weight = 5
min_players = 15
max_occurrences = 0
max_occurrences = 0 //GS13 Edit: Disabling this for now.
category = EVENT_CATEGORY_AI
description = "Vending machines will attack people until the Patient Zero is disabled."
code/modules/events/disease_outbreak.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/datum/round_event_control/disease_outbreak
name = "Disease Outbreak"
typepath = /datum/round_event/disease_outbreak
max_occurrences = 0
max_occurrences = 0 //GS13 Edit: Disabling this for now.
min_players = 5
weight = 5
category = EVENT_CATEGORY_HEALTH
code/modules/events/electrical_storm.dm
+3 -3
View File
@@ -1,16 +1,16 @@
/datum/round_event_control/electrical_storm
name = "Electrical Storm"
typepath = /datum/round_event/electrical_storm
earliest_start = 30 MINUTES
earliest_start = 30 MINUTES //GS13 Edit: Reducing pain for normal station ongoings.
min_players = 5
weight = 40
max_occurrences = 2
max_occurrences = 2 //GS13 Edit: Limiting this.
category = EVENT_CATEGORY_ENGINEERING
description = "Destroys all lights in a large area."
/datum/round_event/electrical_storm
var/lightsoutAmount = 1
var/lightsoutRange = 10
var/lightsoutRange = 10 //GS13 Edit: 25 down to 10
announce_when = 1
/datum/round_event/electrical_storm/announce(fake)
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/mice_migration.dm
+2 -2
View File
@@ -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 = 3
var/maximum_mice = 8
var/minimum_mice = 3 //GS13 Edit: 5 to 3, mice ravage the station in lowpop
var/maximum_mice = 8 //GS13 Edit: 15 to 8, See above.
/datum/round_event/mice_migration/announce(fake)
var/cause = pick("space-winter", "budget-cuts", "Ragnarok",
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/shuttle_loan.dm
+37 -30
View File
@@ -1,18 +1,18 @@
#define SNACK_ATTACK 1 //GS13
#define HIJACK_SYNDIE 2
#define RUSKY_PARTY 3
#define SPIDER_GIFT 4
#define DEPARTMENT_RESUPPLY 5
#define ANTIDOTE_NEEDED 6
#define PIZZA_DELIVERY 7
#define ITS_HIP_TO 8
#define MY_GOD_JC 9
#define DELTA_CRATES 10
#define HIJACK_SYNDIE 1
#define RUSKY_PARTY 2
#define SPIDER_GIFT 3
#define DEPARTMENT_RESUPPLY 4
#define ANTIDOTE_NEEDED 5
#define PIZZA_DELIVERY 6
#define ITS_HIP_TO 7
#define MY_GOD_JC 8
#define DELTA_CRATES 9
#define SNACK_ATTACK 10 //GS13 Add: Snack attack
/datum/round_event_control/shuttle_loan
name = "Shuttle Loan"
typepath = /datum/round_event/shuttle_loan
max_occurrences = 3
max_occurrences = 20 //GS13 Edit: increasing this because they're a fun event
earliest_start = 15 MINUTES
category = EVENT_CATEGORY_BUREAUCRATIC
description = "If cargo accepts the offer, fills the shuttle with loot and/or enemies."
@@ -26,16 +26,13 @@
var/thanks_msg = "The cargo shuttle should return in five minutes. Have some supply points for your trouble."
/datum/round_event/shuttle_loan/setup()
dispatch_type = pick(HIJACK_SYNDIE, RUSKY_PARTY, SPIDER_GIFT, DEPARTMENT_RESUPPLY, ANTIDOTE_NEEDED, PIZZA_DELIVERY, ITS_HIP_TO, MY_GOD_JC)
dispatch_type = pick(HIJACK_SYNDIE, RUSKY_PARTY, SPIDER_GIFT, DEPARTMENT_RESUPPLY, ANTIDOTE_NEEDED, PIZZA_DELIVERY, ITS_HIP_TO, MY_GOD_JC, SNACK_ATTACK) //GS13 Edit: Snack Attack shuttle
/datum/round_event/shuttle_loan/announce(fake)
SSshuttle.shuttle_loan = src
var/message = "Cargo: I just wanna tell you techs good luck, we are all counting on you."
var/title = "CentCom Free Real Estate"
switch(dispatch_type)
if(SNACK_ATTACK) //GS13
message = "Cargo: Our science division took couple too many samples from one the local candy biohabitats. Would you care to dispose of the unneeded specimen?"
title = "CentCom Science Division"
if(HIJACK_SYNDIE)
message = "Cargo: The syndicate are trying to infiltrate your station. If you let them hijack your cargo shuttle, you'll save us a headache."
title = "CentCom Counter Intelligence"
@@ -66,6 +63,11 @@
message = "Cargo: We have discovered a warehouse of DELTA locked crates. We can't store any more of them at CC, can you take them for us?"
title = "CentCom Security Division"
bonus_points = 25000 //If you mess up, people die and the shuttle gets turned into swiss cheese
//GS13 Start: Snack Attack shuttle
if(SNACK_ATTACK)
message = "Cargo: Our science division took couple too many samples from one the local candy biohabitats. Would you care to dispose of the unneeded specimen?"
title = "CentCom Science Division"
//GS13 End
if(prob(50))
priority_announce(message, title)
else
@@ -85,8 +87,6 @@
SSshuttle.supply.setTimer(3000)
switch(dispatch_type)
if(SNACK_ATTACK) //GS13
SSshuttle.centcom_message += "Snack attack en route."
if(HIJACK_SYNDIE)
SSshuttle.centcom_message += "Syndicate hijack team incoming."
if(RUSKY_PARTY)
@@ -105,6 +105,10 @@
SSshuttle.centcom_message += "Live explosive ordnance incoming. Exercise extreme caution."
if(DELTA_CRATES)
SSshuttle.centcom_message += "DELTA Locked crates incoming. Exercise extreme caution."
//GS13 Start: Snack attack shuttle
if(SNACK_ATTACK)
SSshuttle.centcom_message += "Snack attack en route."
//GS13 End
/datum/round_event/shuttle_loan/tick()
if(dispatched)
@@ -131,19 +135,6 @@
var/list/shuttle_spawns = list()
switch(dispatch_type)
if(SNACK_ATTACK) //GS13
shuttle_spawns.Add(/mob/living/simple_animal/hostile/feed/chocolate_slime)
shuttle_spawns.Add(/mob/living/simple_animal/hostile/feed/chocolate_slime)
shuttle_spawns.Add(/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast)
if(prob(50))
shuttle_spawns.Add(/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast)
shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/donut/choco)
shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/donut/choco)
shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/donut/choco)
shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/chocoorange)
shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/chocoorange)
shuttle_spawns.Add(/obj/item/paper/fluff/chocoslime_research)
if(HIJACK_SYNDIE)
var/datum/supply_pack/pack = SSshuttle.supply_packs[/datum/supply_pack/emergency/specialops]
pack.generate(pick_n_take(empty_shuttle_turfs))
@@ -270,6 +261,21 @@
var/turf/T = pick_n_take(empty_shuttle_turfs)
new /obj/structure/spider/stickyweb(T)
new /obj/effect/decal/cleanable/ash(T)
//GS13 Start: Snack Attack Shuttle
if(SNACK_ATTACK) //GS13
shuttle_spawns.Add(/mob/living/simple_animal/hostile/feed/chocolate_slime)
shuttle_spawns.Add(/mob/living/simple_animal/hostile/feed/chocolate_slime)
shuttle_spawns.Add(/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast)
if(prob(50))
shuttle_spawns.Add(/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast)
shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/donut/choco)
shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/donut/choco)
shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/donut/choco)
shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/chocoorange)
shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/chocoorange)
shuttle_spawns.Add(/obj/item/paper/fluff/chocoslime_research)
//GS13 End
var/false_positive = 0
while(shuttle_spawns.len && empty_shuttle_turfs.len)
@@ -315,3 +321,4 @@
#undef ITS_HIP_TO
#undef MY_GOD_JC
#undef DELTA_CRATES
#undef SNACK_ATTACK //GS13 Add: Snack attack
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
+9 -4
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."
@@ -15,19 +15,23 @@
var/list/vents = list()
var/randomProbability = 0
var/reagentsAmount = 100
var/list/saferChems = list( //GS13 - removed some of those chems, just a couple particularly annoying ones
var/list/saferChems = list(
/datum/reagent/water,
/datum/reagent/carbon,
/datum/reagent/consumable/flour,
/datum/reagent/space_cleaner,
/datum/reagent/consumable/nutriment,
/datum/reagent/consumable/condensedcapsaicin,
/datum/reagent/drug/mushroomhallucinogen,
/datum/reagent/lube,
/datum/reagent/glitter/pink,
/datum/reagent/glitter/pink_subtle, //GS13 Add: Add our subtle variants of glitter.
/datum/reagent/cryptobiolin,
//datum/reagent/toxin/plantbgone, //GS13 Remove: Annoying Reagent
/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,
@@ -47,6 +51,7 @@
/datum/reagent/hair_dye,
/datum/reagent/consumable/sugar,
/datum/reagent/glitter/white,
/datum/reagent/glitter/white_subtle, //GS13 ADD: Add our subtle variants of glitter. ...Why is this separate from the other glitter, anyhow? Blue glitter's also missing, so I wont add it.
/datum/reagent/growthserum,
/datum/reagent/consumable/cornoil,
/datum/reagent/uranium,
@@ -112,7 +117,7 @@
/datum/round_event/vent_clog/threatening
randomProbability = 10
reagentsAmount = 100
reagentsAmount = 200
/datum/round_event_control/vent_clog/catastrophic
name = "Clogged Vents: Catastrophic"