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

Merge pull request #21 from ReoDaProtovali/Fixing-the-fixes

Browse Source 
Plentitide of small fixes part 2: electric boogaloo
This commit is contained in:
evilew
2024-11-17 20:35:18 +01:00
committed by GitHub
parent 5b8db19c80 0d3e6e9a31
commit 10a07b2b0d
77 changed files with 2858 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/abductor/abductee/abductee_objectives.dm
+1 -1
View File
@@ -4,7 +4,7 @@
/datum/objective/abductee/random
/datum/objective/abductee/random/New()
explanation_text = pick(world.file2list("strings/abductee_objectives.txt"))
explanation_text = pick(world.file2list("GainStation13/strings/abductee_objectives.txt")) //GS13 Edit: Nanotrasen to GATO
/datum/objective/abductee/steal
explanation_text = "Steal all"
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/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/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/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/vent_clog.dm
+7 -2
View File
@@ -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"
code/modules/games/cas.dm
+3 -3
View File
@@ -18,7 +18,7 @@
var/card_face = "cas_white"
var/blanks = 25
var/decksize = 150
var/card_text_file = "strings/cas_white.txt"
var/card_text_file = "GainStation13/strings/cas_white.txt" //GS13 Edit: Nanotrasen to GATO
var/list/allcards = list()
/obj/item/toy/cards/deck/cas/black
@@ -29,10 +29,10 @@
card_face = "cas_black"
blanks = 0
decksize = 50
card_text_file = "strings/cas_black.txt"
card_text_file = "GainStation13/strings/cas_black.txt" //GS13 Edit: Nanotrasen to GATO
/obj/item/toy/cards/deck/cas/populate_deck()
var/static/list/cards_against_space = list("cas_white" = world.file2list("strings/cas_white.txt"),"cas_black" = world.file2list("strings/cas_black.txt"))
var/static/list/cards_against_space = list("cas_white" = world.file2list("GainStation13/strings/cas_white.txt"),"cas_black" = world.file2list("GainStation13/strings/cas_black.txt")) //GS13 Edit: Nanotrasen to GATO
allcards = cards_against_space[card_face]
var/list/possiblecards = allcards.Copy()
if(possiblecards.len < decksize) // sanity check
code/modules/holiday/halloween/jacqueen.dm
+1 -1
View File
@@ -34,7 +34,7 @@
/mob/living/simple_animal/jacq
name = "Jacqueline the Pumpqueen"
real_name = "Jacqueline"
icon = 'GainStation13/icons/obj/halloween_items.dmi'
icon = 'GainStation13/icons/obj/halloween_items.dmi' //GS13 Edit: Fat Jacqueline
icon_state = "jacqueline"
maxHealth = 25
health = 25
code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm
+1 -1
View File
@@ -66,7 +66,7 @@
if(mob_size == MOB_SIZE_LARGE)
cuff_icon += "_[caste]"
dmi_file = 'hyperstation/icons/mobs/alienqueen.dmi' //GS13 - moving over Hyper sprites
dmi_file = 'GainStation13/icons/mob/alienqueen.dmi' //GS13 Edit: Adding our handcuff icons to the aliens.
var/mutable_appearance/cuffs = mutable_appearance(dmi_file, cuff_icon, -HANDCUFF_LAYER)
cuffs.color = handcuffed.color
code/modules/mob/living/carbon/alien/humanoid/queen.dm
+2 -2
View File
@@ -1,6 +1,6 @@
/mob/living/carbon/alien/humanoid/royal
//Common stuffs for Praetorian and Queen
icon = 'hyperstation/icons/mobs/alienqueen.dmi'
icon = 'icons/mob/alienqueen.dmi'
status_flags = 0
unique_name = 0
pixel_x = -16
@@ -17,7 +17,7 @@
meleeSlashHumanPower = 30
meleeSlashSAPower = 60
var/alt_inhands_file = 'hyperstation/icons/mobs/alienqueen.dmi' //GS13 - moving over Hyper sprites
var/alt_inhands_file = 'icons/mob/alienqueen.dmi'
/mob/living/carbon/alien/humanoid/royal/can_inject(mob/user, error_msg, target_zone, penetrate_thick = FALSE, bypass_immunity = FALSE)
return FALSE
code/modules/mob/living/simple_animal/hostile/alien.dm
+1 -1
View File
@@ -145,7 +145,7 @@
/mob/living/simple_animal/hostile/alien/queen/large
name = "alien empress"
icon = 'hyperstation/icons/mobs/alienqueen.dmi' //GS13 - moving over Hyper sprites
icon = 'icons/mob/alienqueen.dmi'
icon_state = "alienq"
icon_living = "alienq"
icon_dead = "alienq_dead"
code/modules/mob/living/simple_animal/hostile/bear.dm
+1 -1
View File
@@ -27,7 +27,7 @@
spacewalk = TRUE
var/armored = FALSE
obj_damage = 20
obj_damage = 60
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