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

Merge pull request #14 from sheepishgoat/fixes-and-maps

Browse Source 
plentitude of small fixes
This commit is contained in:
sheepishgoat
2024-10-30 14:15:55 -04:00
committed by GitHub
parent c91abc56f7 096df974f5
commit 81d700f1a7
120 changed files with 377 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/anomaly_pyro.dm
+1 -1
View File
@@ -3,7 +3,7 @@
typepath = /datum/round_event/anomaly/anomaly_pyro
min_players = 10 //GS13 tweak
max_occurrences = 5
max_occurrences = 0
weight = 20
description = "This anomaly sets things on fire, and creates a pyroclastic slime."
code/modules/events/brain_trauma.dm
+2 -1
View File
@@ -2,7 +2,8 @@
name = "Spontaneous Brain Trauma"
typepath = /datum/round_event/brain_trauma
weight = 25
min_players = 8 //GS13 - somewhat harmless ig
min_players = 20 //GS13 - somewhat harmless ig
max_occurrences = 0
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 = 1
max_occurrences = 0
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 = 3
max_occurrences = 0
min_players = 5
weight = 5
category = EVENT_CATEGORY_HEALTH
code/modules/events/electrical_storm.dm
+3 -2
View File
@@ -1,15 +1,16 @@
/datum/round_event_control/electrical_storm
name = "Electrical Storm"
typepath = /datum/round_event/electrical_storm
earliest_start = 20 MINUTES
earliest_start = 30 MINUTES
min_players = 5
weight = 40
max_occurrences = 2
category = EVENT_CATEGORY_ENGINEERING
description = "Destroys all lights in a large area."
/datum/round_event/electrical_storm
var/lightsoutAmount = 1
var/lightsoutRange = 25
var/lightsoutRange = 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 = 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",
code/modules/events/shuttle_loan.dm
+28 -9
View File
@@ -1,12 +1,13 @@
#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 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
/datum/round_event_control/shuttle_loan
name = "Shuttle Loan"
@@ -32,6 +33,9 @@
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"
@@ -81,6 +85,8 @@
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)
@@ -125,6 +131,19 @@
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))
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 = 'icons/obj/halloween_items.dmi'
icon = 'GainStation13/icons/obj/halloween_items.dmi'
icon_state = "jacqueline"
maxHealth = 25
health = 25
code/modules/mob/dead/new_player/new_player.dm
+1 -1
View File
@@ -493,7 +493,7 @@
if(!arrivals_docked)
var/atom/movable/screen/splash/Spl = new(character.client, TRUE)
Spl.Fade(TRUE)
character.playsound_local(get_turf(character), 'sound/voice/ApproachingTG.ogg', 25)
character.playsound_local(get_turf(character), 'GainStation13/sound/voice/Approaching.ogg', 25) //GS13 - "now approaching, general station 13"
job.standard_assign_skills(character.mind)
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 = 'icons/mob/alienqueen.dmi'
dmi_file = 'hyperstation/icons/mobs/alienqueen.dmi' //GS13 - moving over Hyper sprites
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 = 'icons/mob/alienqueen.dmi'
icon = 'hyperstation/icons/mobs/alienqueen.dmi'
status_flags = 0
unique_name = 0
pixel_x = -16
@@ -17,7 +17,7 @@
meleeSlashHumanPower = 30
meleeSlashSAPower = 60
var/alt_inhands_file = 'icons/mob/alienqueen.dmi'
var/alt_inhands_file = 'hyperstation/icons/mobs/alienqueen.dmi' //GS13 - moving over Hyper sprites
/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 = 'icons/mob/alienqueen.dmi'
icon = 'hyperstation/icons/mobs/alienqueen.dmi' //GS13 - moving over Hyper sprites
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 = 60
obj_damage = 20
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
code/modules/vending/clothesmate.dm
+1 -2
View File
@@ -228,7 +228,6 @@
/obj/item/clothing/under/costume/basil_boys = 20,
/obj/item/clothing/head/basil_boys = 20,
/obj/item/clothing/shoes/basil_boys = 20,
/* Commenting out until next Christmas or made automatic
/obj/item/clothing/accessory/sweater/uglyxmas = 3,
/obj/item/clothing/under/costume/christmas = 3,
/obj/item/clothing/under/costume/christmas/green = 3,
@@ -242,7 +241,6 @@
/obj/item/clothing/shoes/winterboots/christmasbootsr = 3,
/obj/item/clothing/shoes/winterboots/christmasbootsg = 3,
/obj/item/clothing/shoes/winterboots/santaboots = 3,
*/
/obj/item/clothing/head/cowboyhat = 3,
/obj/item/clothing/head/cowboyhat/black = 3,
/obj/item/clothing/head/cowboyhat/white = 3,
@@ -269,6 +267,7 @@
/obj/item/clothing/suit/vapeshirt = 2,
/obj/item/clothing/under/costume/geisha = 4,
/obj/item/clothing/under/misc/keyholesweater = 3,
/obj/item/clothing/suit/space/hardsuit/engine/haydee = 1, //GS13
/obj/item/clothing/under/misc/staffassistant = 5)
premium = list(/obj/item/clothing/under/suit/checkered = 4,
/obj/item/clothing/head/mailman = 2,