From bdccf133cb10ae5705dccf1fa2bcbad89ed8d251 Mon Sep 17 00:00:00 2001 From: evilew Date: Wed, 20 Nov 2024 15:51:04 +0100 Subject: [PATCH] load of fixes - increased age_min from 18 to 21 - gave RCDs an option of airlock direction - buffed bluespace trays - made more windows / walls directional and merging with airlocks/windows - gave the rusty walls perspective sprites - removed stoner language from beach bum - enabled prisoner (for now) - buffed HEVA not to be weak to goliaths - brought back smaller, more realistic bee sprites --- GainStation13/icons/mob/bees.dmi | Bin 0 -> 2932 bytes GainStation13/icons/mob/radial.dmi | Bin 0 -> 17710 bytes code/__DEFINES/mobs.dm | 2 +- code/game/objects/items/RCD.dm | 22 +++ code/game/objects/items/storage/bags.dm | 2 +- code/game/objects/structures/window.dm | 146 +++++++++++++++++- code/game/turfs/simulated/floor.dm | 1 + code/game/turfs/simulated/wall/misc_walls.dm | 48 +++++- code/modules/awaymissions/corpse.dm | 10 +- code/modules/jobs/job_types/prisoner.dm | 4 +- .../modules/mining/equipment/explorer_gear.dm | 4 +- .../mob/living/simple_animal/hostile/bees.dm | 6 +- .../datums/components/crafting/bounties.dm | 4 +- 13 files changed, 229 insertions(+), 20 deletions(-) create mode 100644 GainStation13/icons/mob/bees.dmi create mode 100644 GainStation13/icons/mob/radial.dmi diff --git a/GainStation13/icons/mob/bees.dmi b/GainStation13/icons/mob/bees.dmi new file mode 100644 index 0000000000000000000000000000000000000000..5d9bfea48b6e7c2ebced4097eac6743127692637 GIT binary patch literal 2932 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 literal 0 HcmV?d00001 diff --git a/GainStation13/icons/mob/radial.dmi b/GainStation13/icons/mob/radial.dmi new file mode 100644 index 0000000000000000000000000000000000000000..3dfdd2fd5a744bbfdf0ed2505932fe94546c7f08 GIT binary patch literal 17710 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 literal 0 HcmV?d00001 diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index a97c862adc..07b743b9e8 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -297,7 +297,7 @@ #define OFFSET_MUTPARTS "mutantparts" // MINOR TWEAKS/MISC -#define AGE_MIN 18 // youngest a character can be // CITADEL EDIT - 17 --> 18 +#define AGE_MIN 21 // youngest a character can be // CITADEL EDIT - 17 --> 18 //GS13 EDIT - 18 --> 21 #define AGE_MAX 85 // oldest a character can be randomly generated #define AGE_MAX_INPUT 85 // oldest a character's age can be manually set #define WIZARD_AGE_MIN 30 // youngest a wizard can be diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm index 868adf97f2..129e1cb8be 100644 --- a/code/game/objects/items/RCD.dm +++ b/code/game/objects/items/RCD.dm @@ -38,6 +38,7 @@ RLD var/ammo_sections = 10 //amount of divisions in the ammo indicator overlay/number of ammo indicator states var/custom_range = 7 var/upgrade = FALSE + var/airlock_dir = 1 //GS13 - airlock direction function /obj/item/construction/Initialize(mapload) . = ..() @@ -283,6 +284,23 @@ RLD //Not scaling these down to button size because they look horrible then, instead just bumping up radius. return MA + +/obj/item/construction/rcd/proc/change_airlock_direction(mob/user) //GS13 - change airlock direction + if(!user) + return + var/list/airlock_dirs = list( + "North/South" = image(icon = 'icons/mob/radial.dmi', icon_state = "airlocknorthsouth"), + "East/West" = image(icon = 'icons/mob/radial.dmi', icon_state = "airlockeastwest") + ) + var/airlockdirs = show_radial_menu(user, src, airlock_dirs, custom_check = CALLBACK(src,PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) + if(!check_menu(user)) + return + switch(airlockdirs) + if("North/South") + airlock_dir = 1 + if("East/West") + airlock_dir = 4 + /obj/item/construction/rcd/proc/change_computer_dir(mob/user) if(!user) return @@ -488,6 +506,7 @@ RLD if(mode == RCD_AIRLOCK) choices += list( "Change Access" = image(icon = 'icons/mob/radial.dmi', icon_state = "access"), + "Change Direction" = image(icon = 'GainStation13/icons/mob/radial.dmi', icon_state = "airlockrotation"), //GS13 - adding airlock rotation "Change Airlock Type" = image(icon = 'icons/mob/radial.dmi', icon_state = "airlocktype") ) else if(mode == RCD_WINDOWGRILLE) @@ -515,6 +534,9 @@ RLD if("Change Access") change_airlock_access(user) return + if("Change Direction") //GS13 - adding airlock direction in RCD + change_airlock_direction(user) + return if("Change Airlock Type") change_airlock_setting(user) return diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index e080310b68..b6145ab112 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -388,7 +388,7 @@ name = "bluespace tray" icon_state = "bluespace_tray" desc = "A tray created using bluespace technology to fit more food on it." - max_items = 30 // far more items + max_items = 50 //GS13 - we loooove our mountains of food here custom_materials = list(/datum/material/iron = 2000, /datum/material/bluespace = 500) /* diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index e8d8e927c9..1fee950cf3 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -660,6 +660,53 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup) wave_explosion_block = EXPLOSION_BLOCK_EXTREME wave_explosion_multiply = EXPLOSION_BLOCK_EXTREME glass_type = /obj/item/stack/sheet/plasmarglass + canSmoothWith = list( + /turf/closed/wall, + /turf/closed/wall/r_wall, + /obj/structure/falsewall, + /obj/structure/falsewall/brass, + /obj/structure/falsewall/reinforced, + /turf/closed/wall/rust, + /turf/closed/wall/r_wall/rust, + /turf/closed/wall/clockwork, + /turf/closed/indestructible/riveted/, + /turf/closed/indestructible/riveted/uranium, + /obj/structure/window/fulltile, + /obj/structure/window/reinforced/fulltile, + /obj/structure/window/reinforced/tinted/fulltile, + /obj/machinery/door, + /obj/machinery/door/airlock/, + /obj/machinery/door/airlock/mining, + /obj/machinery/door/airlock/mining/glass, + /obj/machinery/door/airlock/medical, + /obj/machinery/door/airlock/medical/glass, + /obj/machinery/door/airlock/public, + /obj/machinery/door/airlock/public/glass, + /obj/machinery/door/airlock/research, + /obj/machinery/door/airlock/research/glass, + /obj/machinery/door/airlock/maintenance, + /obj/machinery/door/airlock/maintenance/glass, + /obj/machinery/door/airlock/command/, + /obj/machinery/door/airlock/command/glass, + /obj/machinery/door/airlock/engineering, + /obj/machinery/door/airlock/engineering/glass, + /obj/machinery/door/airlock/engineering/abandoned, + /obj/machinery/door/airlock/security, + /obj/machinery/door/airlock/security/glass, + /obj/machinery/door/airlock/maintenance/abandoned, + /obj/machinery/door/poddoor/shutters/preopen, + /obj/machinery/door/poddoor/shutters, + /obj/machinery/door/window/eastright, + /obj/machinery/door/window/eastleft, + /obj/machinery/door/window/northleft, + /obj/machinery/door/window/northright, + /obj/machinery/door/airlock/external, + /obj/machinery/door/airlock, + /obj/machinery/door/airlock/hatch, + /obj/machinery/door/airlock/engineering/glass/critical, + /obj/machinery/door/airlock/atmos, + /obj/machinery/door/airlock/highsecurity,) //GS13 - directional wall sprites will smooth with windows/airlocks + /obj/structure/window/plasma/reinforced/spawner/east dir = EAST @@ -740,7 +787,7 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup) /obj/machinery/door/airlock/hatch, /obj/machinery/door/airlock/engineering/glass/critical, /obj/machinery/door/airlock/atmos, - /obj/machinery/door/airlock/highsecurity,) + /obj/machinery/door/airlock/highsecurity,) //GS13 - directional wall sprites will smooth with windows/airlocks glass_amount = 2 @@ -801,7 +848,7 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup) /obj/machinery/door/airlock/hatch, /obj/machinery/door/airlock/engineering/glass/critical, /obj/machinery/door/airlock/atmos, - /obj/machinery/door/airlock/highsecurity,) + /obj/machinery/door/airlock/highsecurity,) //GS13 - directional wall sprites will smooth with windows/airlocks glass_amount = 2 @@ -817,6 +864,53 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup) flags_1 = PREVENT_CLICK_UNDER_1 smooth = SMOOTH_TRUE glass_amount = 2 + canSmoothWith = list( + /turf/closed/wall, + /turf/closed/wall/r_wall, + /obj/structure/falsewall, + /obj/structure/falsewall/brass, + /obj/structure/falsewall/reinforced, + /turf/closed/wall/rust, + /turf/closed/wall/r_wall/rust, + /turf/closed/wall/clockwork, + /turf/closed/indestructible/riveted/, + /turf/closed/indestructible/riveted/uranium, + /obj/structure/window/fulltile, + /obj/structure/window/reinforced/fulltile, + /obj/structure/window/reinforced/tinted/fulltile, + /obj/machinery/door, + /obj/machinery/door/airlock/, + /obj/machinery/door/airlock/mining, + /obj/machinery/door/airlock/mining/glass, + /obj/machinery/door/airlock/medical, + /obj/machinery/door/airlock/medical/glass, + /obj/machinery/door/airlock/public, + /obj/machinery/door/airlock/public/glass, + /obj/machinery/door/airlock/research, + /obj/machinery/door/airlock/research/glass, + /obj/machinery/door/airlock/maintenance, + /obj/machinery/door/airlock/maintenance/glass, + /obj/machinery/door/airlock/command/, + /obj/machinery/door/airlock/command/glass, + /obj/machinery/door/airlock/engineering, + /obj/machinery/door/airlock/engineering/glass, + /obj/machinery/door/airlock/engineering/abandoned, + /obj/machinery/door/airlock/security, + /obj/machinery/door/airlock/security/glass, + /obj/machinery/door/airlock/maintenance/abandoned, + /obj/machinery/door/poddoor/shutters/preopen, + /obj/machinery/door/poddoor/shutters, + /obj/machinery/door/window/eastright, + /obj/machinery/door/window/eastleft, + /obj/machinery/door/window/northleft, + /obj/machinery/door/window/northright, + /obj/machinery/door/airlock/external, + /obj/machinery/door/airlock, + /obj/machinery/door/airlock/hatch, + /obj/machinery/door/airlock/engineering/glass/critical, + /obj/machinery/door/airlock/atmos, + /obj/machinery/door/airlock/highsecurity,) //GS13 - directional wall sprites will smooth with windows/airlocks + /obj/structure/window/plasma/reinforced/fulltile/unanchored anchored = FALSE @@ -875,7 +969,7 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup) /obj/machinery/door/airlock/hatch, /obj/machinery/door/airlock/engineering/glass/critical, /obj/machinery/door/airlock/atmos, - /obj/machinery/door/airlock/highsecurity,) + /obj/machinery/door/airlock/highsecurity,) //GS13 - directional wall sprites will smooth with windows/airlocks level = 3 glass_amount = 2 @@ -1046,6 +1140,52 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup) level = 3 glass_type = /obj/item/stack/sheet/plastitaniumglass glass_amount = 2 + canSmoothWith = list( + /turf/closed/wall, + /turf/closed/wall/r_wall, + /obj/structure/falsewall, + /obj/structure/falsewall/brass, + /obj/structure/falsewall/reinforced, + /turf/closed/wall/rust, + /turf/closed/wall/r_wall/rust, + /turf/closed/wall/clockwork, + /turf/closed/indestructible/riveted/, + /turf/closed/indestructible/riveted/uranium, + /obj/structure/window/fulltile, + /obj/structure/window/reinforced/fulltile, + /obj/structure/window/reinforced/tinted/fulltile, + /obj/machinery/door, + /obj/machinery/door/airlock/, + /obj/machinery/door/airlock/mining, + /obj/machinery/door/airlock/mining/glass, + /obj/machinery/door/airlock/medical, + /obj/machinery/door/airlock/medical/glass, + /obj/machinery/door/airlock/public, + /obj/machinery/door/airlock/public/glass, + /obj/machinery/door/airlock/research, + /obj/machinery/door/airlock/research/glass, + /obj/machinery/door/airlock/maintenance, + /obj/machinery/door/airlock/maintenance/glass, + /obj/machinery/door/airlock/command/, + /obj/machinery/door/airlock/command/glass, + /obj/machinery/door/airlock/engineering, + /obj/machinery/door/airlock/engineering/glass, + /obj/machinery/door/airlock/engineering/abandoned, + /obj/machinery/door/airlock/security, + /obj/machinery/door/airlock/security/glass, + /obj/machinery/door/airlock/maintenance/abandoned, + /obj/machinery/door/poddoor/shutters/preopen, + /obj/machinery/door/poddoor/shutters, + /obj/machinery/door/window/eastright, + /obj/machinery/door/window/eastleft, + /obj/machinery/door/window/northleft, + /obj/machinery/door/window/northright, + /obj/machinery/door/airlock/external, + /obj/machinery/door/airlock, + /obj/machinery/door/airlock/hatch, + /obj/machinery/door/airlock/engineering/glass/critical, + /obj/machinery/door/airlock/atmos, + /obj/machinery/door/airlock/highsecurity,) //GS13 - directional wall sprites will smooth with windows/airlocks /obj/structure/window/plastitanium/unanchored anchored = FALSE diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 96ce593470..d02cf49fc9 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -314,6 +314,7 @@ to_chat(user, "You build an airlock.") var/obj/machinery/door/airlock/A = new the_rcd.airlock_type(src) + A.setDir(the_rcd.airlock_dir) //GS13 - directional airlocks edit A.electronics = new/obj/item/electronics/airlock(A) if(the_rcd.conf_access) diff --git a/code/game/turfs/simulated/wall/misc_walls.dm b/code/game/turfs/simulated/wall/misc_walls.dm index 4ec2fa2357..5edb35f9f0 100644 --- a/code/game/turfs/simulated/wall/misc_walls.dm +++ b/code/game/turfs/simulated/wall/misc_walls.dm @@ -186,7 +186,53 @@ /turf/closed/wall/rust name = "rusted wall" desc = "A rusted metal wall." - icon = 'icons/turf/walls/rusty_wall.dmi' + icon = 'GainStation13/icons/turf/walls/rusty_wall.dmi' //GS13 - perspective walls + canSmoothWith = list( + /turf/closed/wall, + /turf/closed/wall/r_wall, + /obj/structure/falsewall, + /obj/structure/falsewall/brass, + /obj/structure/falsewall/reinforced, + /turf/closed/wall/rust, + /turf/closed/wall/r_wall/rust, + /turf/closed/wall/clockwork, + /turf/closed/indestructible/riveted/, + /turf/closed/indestructible/riveted/uranium, + /obj/structure/window/fulltile, + /obj/structure/window/reinforced/fulltile, + /obj/structure/window/reinforced/tinted/fulltile, + /obj/machinery/door, + /obj/machinery/door/airlock/, + /obj/machinery/door/airlock/mining, + /obj/machinery/door/airlock/mining/glass, + /obj/machinery/door/airlock/medical, + /obj/machinery/door/airlock/medical/glass, + /obj/machinery/door/airlock/public, + /obj/machinery/door/airlock/public/glass, + /obj/machinery/door/airlock/research, + /obj/machinery/door/airlock/research/glass, + /obj/machinery/door/airlock/maintenance, + /obj/machinery/door/airlock/maintenance/glass, + /obj/machinery/door/airlock/command/, + /obj/machinery/door/airlock/command/glass, + /obj/machinery/door/airlock/engineering, + /obj/machinery/door/airlock/engineering/glass, + /obj/machinery/door/airlock/engineering/abandoned, + /obj/machinery/door/airlock/security, + /obj/machinery/door/airlock/security/glass, + /obj/machinery/door/airlock/maintenance/abandoned, + /obj/machinery/door/poddoor/shutters/preopen, + /obj/machinery/door/poddoor/shutters, + /obj/machinery/door/window/eastright, + /obj/machinery/door/window/eastleft, + /obj/machinery/door/window/northleft, + /obj/machinery/door/window/northright, + /obj/machinery/door/airlock/external, + /obj/machinery/door/airlock, + /obj/machinery/door/airlock/hatch, + /obj/machinery/door/airlock/engineering/glass/critical, + /obj/machinery/door/airlock/atmos, + /obj/machinery/door/airlock/highsecurity,) //GS13 - directional wall sprites will smooth with windows/airlocks hardness = 45 /turf/closed/wall/rust/rust_heretic_act() diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 041dd4be96..f7bf2534cd 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -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////////////////////// diff --git a/code/modules/jobs/job_types/prisoner.dm b/code/modules/jobs/job_types/prisoner.dm index 732ac03016..49056581f9 100644 --- a/code/modules/jobs/job_types/prisoner.dm +++ b/code/modules/jobs/job_types/prisoner.dm @@ -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 diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm index facb34db47..800f050152 100644 --- a/code/modules/mining/equipment/explorer_gear.dm +++ b/code/modules/mining/equipment/explorer_gear.dm @@ -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) ..() diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm index d245b68348..83c0084fbc 100644 --- a/code/modules/mob/living/simple_animal/hostile/bees.dm +++ b/code/modules/mob/living/simple_animal/hostile/bees.dm @@ -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 diff --git a/hyperstation/code/datums/components/crafting/bounties.dm b/hyperstation/code/datums/components/crafting/bounties.dm index e6fd87b94f..14ea210f4d 100644 --- a/hyperstation/code/datums/components/crafting/bounties.dm +++ b/hyperstation/code/datums/components/crafting/bounties.dm @@ -65,7 +65,7 @@ datum/bounty/lewd/fluid/New() //GS13 made some edits here that changes stuff int reagent_type = /datum/reagent/consumable/milk wanted_reagent = new reagent_type name = wanted_reagent.name - description = "The GATO annual bake sale is soon, and all of our milk has expired. Help us out." + description = "The GATO annual bake sale is soon, and all of our milk has expired. Help us out." //GS13 reward += rand(10, 17) * 500 //Milk is generally easier to get. Make the reward a little lower. if(15,16) //A little romance var/static/list/possible_reagents = list(\ @@ -84,7 +84,7 @@ datum/bounty/lewd/fluid/New() //GS13 made some edits here that changes stuff int reagent_type = /datum/reagent/consumable/lipoifier wanted_reagent = new reagent_type name = wanted_reagent.name - description = "The quality of GATO's meat-related products have diminished. Send us some lipoifier to help with meat production." + description = "The quality of GATO's meat-related products have diminished. Send us some lipoifier to help with meat production." //GS13 reward += rand(2, 7) * 500 /* //Just not getting this to work.