From d57c93b56c30d6ff1cadd76cbc202ac276485b57 Mon Sep 17 00:00:00 2001 From: BrotherHangyul <74551771+BrotherHangyul@users.noreply.github.com> Date: Tue, 14 Nov 2023 22:50:36 +0000 Subject: [PATCH 1/4] undoes some of vega's changes (#336) * a * a * a * a * Update raider.dm * a * a * a --- _maps/map_files/Pahrump/Pahrump-Above-3.dmm | 19 ++++++++++++-- .../Pahrump/Pahrump-Underground-1.dmm | 25 ++++++++----------- .../objects/effects/spawners/f13lootdrop.dm | 11 +++++--- .../simple_animal/hostile/f13/raider.dm | 8 +++--- 4 files changed, 39 insertions(+), 24 deletions(-) diff --git a/_maps/map_files/Pahrump/Pahrump-Above-3.dmm b/_maps/map_files/Pahrump/Pahrump-Above-3.dmm index 8e20c8e138..54570f6515 100644 --- a/_maps/map_files/Pahrump/Pahrump-Above-3.dmm +++ b/_maps/map_files/Pahrump/Pahrump-Above-3.dmm @@ -371,6 +371,11 @@ icon_state = "whitegreenrustychess" }, /area/f13/building) +"bj" = ( +/obj/structure/table, +/obj/effect/spawner/lootdrop/f13/blueprintLowMid, +/turf/open/floor/plasteel/f13/vault_floor/white, +/area/f13/clinic) "bk" = ( /obj/structure/fence{ dir = 1 @@ -2351,6 +2356,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood/f13/carpet, /area/f13/building) +"hw" = ( +/obj/structure/table, +/obj/item/locked_box/medical/drugs, +/turf/open/floor/plasteel/f13/vault_floor/white, +/area/f13/clinic) "hx" = ( /obj/structure/table/reinforced, /turf/open/floor/plasteel/f13/vault_floor/floor, @@ -3311,6 +3321,8 @@ "kx" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/f13/junkspawners, +/obj/effect/spawner/lootdrop/f13/blueprintMid, +/obj/effect/spawner/lootdrop/f13/blueprintHigh, /turf/open/floor/plasteel/f13/vault_floor/white/whitesolid{ icon_state = "whitedirtysolid" }, @@ -12200,6 +12212,8 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/table, /obj/item/defibrillator/primitive, +/obj/item/reagent_containers/hypospray/medipen/medx, +/obj/item/reagent_containers/hypospray/medipen/medx, /turf/open/floor/plasteel/f13/vault_floor/white/whitesolid{ icon_state = "whitedirtysolid" }, @@ -12456,6 +12470,7 @@ /obj/item/organ/heart, /obj/item/reagent_containers/hypospray/medipen/stimpak/super, /obj/machinery/light, +/obj/item/reagent_containers/hypospray/medipen/stimpak/super, /turf/open/floor/plasteel/f13/vault_floor/white/whitesolid{ icon_state = "whitedirtysolid" }, @@ -63010,7 +63025,7 @@ pS Ig WG EY -MF +hw xr lE EY @@ -64564,7 +64579,7 @@ Ve Ve IS EY -MF +bj lq iZ EY diff --git a/_maps/map_files/Pahrump/Pahrump-Underground-1.dmm b/_maps/map_files/Pahrump/Pahrump-Underground-1.dmm index 6504134b65..4a10bb9a5e 100644 --- a/_maps/map_files/Pahrump/Pahrump-Underground-1.dmm +++ b/_maps/map_files/Pahrump/Pahrump-Underground-1.dmm @@ -7407,6 +7407,7 @@ /obj/effect/spawner/lootdrop/f13/weapon/melee/random_mid, /obj/effect/spawner/lootdrop/f13/weapon/melee/random, /obj/effect/spawner/lootdrop/f13/weapon/gun/tier4, +/obj/effect/spawner/lootdrop/f13/armor/tier3, /turf/open/floor/f13{ icon_state = "bluerustysolid" }, @@ -7709,11 +7710,6 @@ /obj/item/reagent_containers/food/snacks/meat/slab/ant_meat, /turf/open/indestructible/ground/inside/subway, /area/f13/tunnel) -"fAg" = ( -/obj/structure/simple_door/wood, -/obj/item/mine/explosive, -/turf/open/floor/wood/f13/oak, -/area/f13/building) "fAi" = ( /obj/machinery/light, /obj/effect/decal/cleanable/dirt, @@ -8104,10 +8100,6 @@ /obj/machinery/workbench/advanced, /turf/open/floor/wood/f13/oakbroken3, /area/f13/building) -"fOy" = ( -/mob/living/simple_animal/hostile/raider/ranged/boss, -/turf/open/floor/wood/f13/oak, -/area/f13/building) "fOZ" = ( /obj/structure/simple_door/metal/iron, /obj/structure/barricade/wooden/planks/pregame, @@ -15554,6 +15546,7 @@ /obj/structure/closet/cabinet, /obj/effect/spawner/lootdrop/f13/armor/clothes, /obj/effect/spawner/lootdrop/f13/armor/tier3, +/obj/effect/spawner/lootdrop/f13/armor/tier4, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/tunnel) "lTu" = ( @@ -18269,6 +18262,8 @@ /obj/effect/decal/cleanable/dirt{ color = "#363636" }, +/obj/effect/spawner/lootdrop/f13/armor/tier3, +/obj/effect/spawner/lootdrop/f13/armor/tier4, /turf/open/floor/plasteel/darkred/side{ dir = 4 }, @@ -19667,7 +19662,6 @@ "pCg" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/f13/blueprintLowPartsWeighted, -/obj/effect/spawner/lootdrop/f13/weapon/gun/tier4, /mob/living/simple_animal/hostile/raider/junker/boss{ robust_searching = 1; minimum_distance = 2; @@ -19675,6 +19669,7 @@ melee_damage_lower = 80; melee_damage_upper = 80 }, +/obj/effect/spawner/lootdrop/f13/weapon/gun/tier5, /turf/open/indestructible/ground/inside/mountain, /area/f13/building) "pCJ" = ( @@ -20352,6 +20347,7 @@ dir = 1 }, /obj/effect/spawner/lootdrop/f13/armor/tier3, +/obj/effect/spawner/lootdrop/f13/armor/tier4, /turf/open/indestructible/ground/inside/subway, /area/f13/tunnel) "qhW" = ( @@ -25393,7 +25389,6 @@ /obj/effect/decal/cleanable/dirt{ color = "#363636" }, -/mob/living/simple_animal/hostile/raider/ranged/boss, /turf/open/floor/f13{ icon_state = "floorrusty" }, @@ -26344,6 +26339,7 @@ /area/f13/bunker) "vcM" = ( /obj/item/reagent_containers/hypospray/medipen/stimpak, +/obj/effect/spawner/lootdrop/f13/weapon/gun/tier5, /turf/open/floor/f13{ icon_state = "reddirtyfull" }, @@ -28781,6 +28777,7 @@ /obj/effect/decal/cleanable/dirt{ color = "000000" }, +/obj/effect/spawner/lootdrop/f13/weapon/gun/tier4, /turf/open/floor/carpet/black, /area/f13/building) "wVg" = ( @@ -50093,7 +50090,7 @@ ajV enc bxT bxT -fAg +vEd rMm kGo mDq @@ -50605,7 +50602,7 @@ vPg ydu xLj ocG -fOy +rrZ npt ydu iMA @@ -71552,7 +71549,7 @@ vPg vPg vPg aoj -lnr +bcq iOJ aoj aoj diff --git a/code/game/objects/effects/spawners/f13lootdrop.dm b/code/game/objects/effects/spawners/f13lootdrop.dm index 5a34460bd1..cf79054e81 100644 --- a/code/game/objects/effects/spawners/f13lootdrop.dm +++ b/code/game/objects/effects/spawners/f13lootdrop.dm @@ -1013,13 +1013,14 @@ /obj/item/gun/ballistic/automatic/smg/american180, /obj/effect/spawner/bundle/f13/aer9, /obj/effect/spawner/bundle/f13/wattz2k, - /obj/effect/spawner/lootdrop/f13/weapon/revolver44variants + /obj/effect/spawner/lootdrop/f13/weapon/revolver44variants, + /obj/effect/spawner/bundle/f13/mp5, + /obj/effect/spawner/bundle/f13/smg10mm ) /obj/effect/spawner/lootdrop/f13/weapon/gun/tier4 name = "tier four firearms" - loot = list(/obj/effect/spawner/bundle/f13/mp5, - /obj/effect/spawner/bundle/f13/smg10mm, + loot = list( /obj/effect/spawner/bundle/f13/worn_assault_carbine, /obj/effect/spawner/bundle/f13/marksman, /obj/effect/spawner/bundle/f13/guns/tommygun, @@ -1027,12 +1028,14 @@ /obj/effect/spawner/bundle/f13/aer12, /obj/effect/spawner/bundle/f13/dkssniper, /obj/effect/spawner/bundle/f13/plasmapistol, - /obj/effect/spawner/bundle/f13/wattz2kext + /obj/effect/spawner/bundle/f13/wattz2kext, + /obj/effect/spawner/bundle/f13/r82 ) /obj/effect/spawner/lootdrop/f13/weapon/gun/tier5 name = "tier five firearms" loot = list(/obj/effect/spawner/bundle/f13/assault_rifle, + /obj/effect/spawner/bundle/f13/infiltrator, /obj/effect/spawner/bundle/f13/r84, /obj/effect/spawner/bundle/f13/brushgun, /obj/effect/spawner/bundle/f13/assault_carbine, diff --git a/code/modules/mob/living/simple_animal/hostile/f13/raider.dm b/code/modules/mob/living/simple_animal/hostile/f13/raider.dm index 1904f456fb..09381b6ae4 100644 --- a/code/modules/mob/living/simple_animal/hostile/f13/raider.dm +++ b/code/modules/mob/living/simple_animal/hostile/f13/raider.dm @@ -315,12 +315,12 @@ icon_state = "junker_boss" icon_living = "junker_boss" icon_dead = "junker_dead" - maxHealth = 450 - health = 450 + maxHealth = 400 + health = 400 ranged = TRUE retreat_distance = 4 minimum_distance = 6 - extra_projectiles = 9 - ranged_cooldown_time = 15 + extra_projectiles = 5 + ranged_cooldown_time = 30 projectiletype = /obj/item/projectile/bullet/shrapnel projectilesound = 'sound/f13weapons/auto5.ogg' From 99a7d344598e0ca2e55dfa3e4bfbfa11d62d1cd4 Mon Sep 17 00:00:00 2001 From: BrotherHangyul <74551771+BrotherHangyul@users.noreply.github.com> Date: Tue, 14 Nov 2023 22:51:06 +0000 Subject: [PATCH 2/4] specialisation of specialists 2 (#337) * a * a * a * Update enclave.dm * a * ea * Update enclave.dm --- code/modules/jobs/job_types/bos.dm | 2 +- code/modules/jobs/job_types/enclave.dm | 70 ++++++++++++++++++++------ code/modules/jobs/job_types/legion.dm | 30 +++++++++-- code/modules/jobs/job_types/ncr.dm | 10 ++-- 4 files changed, 87 insertions(+), 25 deletions(-) diff --git a/code/modules/jobs/job_types/bos.dm b/code/modules/jobs/job_types/bos.dm index 7b38c5619f..21008d383d 100644 --- a/code/modules/jobs/job_types/bos.dm +++ b/code/modules/jobs/job_types/bos.dm @@ -237,7 +237,7 @@ Head Knight suit = /obj/item/clothing/suit/armor/f13/combat/brotherhood/captain glasses = /obj/item/clothing/glasses/night accessory = /obj/item/clothing/accessory/bos/headknight - belt = /obj/item/storage/belt/security/full + belt = /obj/item/storage/belt/utility/full/engi neck = /obj/item/storage/belt/holster mask = /obj/item/clothing/mask/gas/sechailer head = /obj/item/clothing/head/helmet/f13/combat/brotherhood/captain diff --git a/code/modules/jobs/job_types/enclave.dm b/code/modules/jobs/job_types/enclave.dm index fad0b58973..88350585ac 100644 --- a/code/modules/jobs/job_types/enclave.dm +++ b/code/modules/jobs/job_types/enclave.dm @@ -150,32 +150,51 @@ outfit = /datum/outfit/job/enclave/peacekeeper/f13gysergeant exp_requirements = 600 + loadout_options = list( + /datum/outfit/loadout/gysergeantshotgun, // shotgun + ripper + /datum/outfit/loadout/gysergeantrifle // carbine, suppressor, ESDs + ) + +/datum/outfit/job/enclave/peacekeeper/f13gysergeant/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + ..() + if(visualsOnly) + return + ADD_TRAIT(H, TRAIT_HARD_YARDS, src) + ADD_TRAIT(H, TRAIT_LIFEGIVER, src) + /datum/outfit/job/enclave/peacekeeper/f13gysergeant name = "Enclave Gunnery Sergeant" jobtype = /datum/job/enclave/f13gysergeant head = /obj/item/clothing/head/helmet/f13/enclave/marine suit = /obj/item/clothing/suit/armor/f13/enclave/marine - suit_store = /obj/item/gun/ballistic/shotgun/automatic/combat/neostead accessory = /obj/item/clothing/accessory/enclave/master_sergeant - backpack_contents = list( - /obj/item/ammo_box/magazine/m45exp = 2, - /obj/item/gun/ballistic/automatic/pistol/mk23 = 1, /obj/item/reagent_containers/hypospray/medipen/stimpak = 2, + /obj/item/gun/ballistic/automatic/pistol/mk23 = 1, + /obj/item/ammo_box/magazine/m45exp = 2, /obj/item/grenade/flashbang = 1, - /obj/item/ammo_box/shotgun/buck = 2, /obj/item/pda = 1, /obj/item/storage/bag/money/small/wastelander = 1, - /obj/item/melee/onehanded/knife/survival = 1, + /obj/item/melee/onehanded/knife/survival = 1 ) -/datum/outfit/job/enclave/peacekeeper/f13gysergeant/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - ..() - if(visualsOnly) - return - ADD_TRAIT(H, TRAIT_HARD_YARDS, src) - ADD_TRAIT(H, TRAIT_LIFEGIVER, src) +/datum/outfit/loadout/gysergeantshotgun + name = "CQC Sergeant" + suit_store = /obj/item/gun/ballistic/shotgun/automatic/combat/citykiller + backpack_contents = list( + /obj/item/ammo_box/shotgun/slug = 2, + /obj/item/ammo_box/shotgun/buck = 2, + /obj/item/melee/powered/ripper/prewar = 1 + ) +/datum/outfit/loadout/gysergeantrifle + name = "Support Sergeant" + suit_store = /obj/item/gun/ballistic/automatic/assault_carbine + backpack_contents = list( + /obj/item/ammo_box/magazine/m5mm = 4, + /obj/item/ammo_box/m5mmbox/shock = 1, + /obj/item/suppressor = 1 + ) //Armored Infantry @@ -277,6 +296,11 @@ outfit = /datum/outfit/job/enclave/peacekeeper/f13specialist exp_requirements = 300 + loadout_options = list( + /datum/outfit/loadout/specmedic, + /datum/outfit/loadout/specengi + ) + /datum/outfit/job/enclave/peacekeeper/f13specialist name = "Enclave Specialist" jobtype = /datum/job/enclave/f13specialist @@ -290,11 +314,29 @@ /obj/item/pda = 1, /obj/item/storage/bag/money/small/wastelander = 1, /obj/item/melee/onehanded/knife/survival = 1, - /obj/item/storage/firstaid/ancient = 1, - /obj/item/gun/medbeam = 1, /obj/item/ammo_box/magazine/m556/rifle = 3, ) +/datum/outfit/loadout/specmedic + name = "Medic" + backpack_contents = list( + /obj/item/gun/medbeam = 1, + /obj/item/storage/firstaid/ancient = 1, + /obj/item/reagent_containers/hypospray/medipen/stimpak = 4, + /obj/item/book/granter/trait/midsurgery = 1, + /obj/item/book/granter/trait/chemistry = 1 + ) + +/datum/outfit/loadout/specengi + name = "Engineer" + backpack_contents = list( + /obj/item/gun/ballistic/revolver/grenadelauncher = 1, + /obj/item/ammo_box/a40mm = 2, + /obj/item/storage/belt/utility/full/engi = 1, + /obj/item/book/granter/trait/techno = 1, + /obj/item/book/granter/trait/explosives = 1 + ) + /datum/outfit/job/enclave/peacekeeper/f13specialist/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) ..() if(visualsOnly) diff --git a/code/modules/jobs/job_types/legion.dm b/code/modules/jobs/job_types/legion.dm index d7c2974b5c..c4a5517c07 100644 --- a/code/modules/jobs/job_types/legion.dm +++ b/code/modules/jobs/job_types/legion.dm @@ -637,6 +637,11 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al supervisors = "the Decanii" display_order = JOB_DISPLAY_ORDER_EXPLORER outfit = /datum/outfit/job/CaesarsLegion/Legionary/f13explorer + + loadout_options = list( + /datum/outfit/loadout/sniper, // scoped rifle + /datum/outfit/loadout/skirmisher, // SMG and tools + ) matchmaking_allowed = list( /datum/matchmaking_pref/friend = list( @@ -663,17 +668,32 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al suit = /obj/item/clothing/suit/armor/f13/legion/vet/explorer head = /obj/item/clothing/head/helmet/f13/legion/vet/explorer glasses = /obj/item/clothing/glasses/sunglasses/big - belt = /obj/item/storage/backpack/spearquiver neck = /obj/item/storage/belt/holster - suit_store = /obj/item/gun/ballistic/rifle/hunting r_pocket = /obj/item/flashlight l_pocket = /obj/item/binoculars backpack_contents = list( /obj/item/storage/bag/money/small/legenlisted = 1, - /obj/item/attachments/scope = 1, /obj/item/melee/onehanded/machete = 1, - /obj/item/restraints/handcuffs = 1, - /obj/item/ammo_box/a308 = 2, + /obj/item/storage/survivalkit/medical/legion = 1, + /obj/item/reagent_containers/pill/patch/healpoultice = 1 + ) + +/datum/outfit/loadout/sniper + name = "Sniper Explorer" + suit_store = /obj/item/gun/ballistic/rifle/repeater/trail + backpack_contents = list( + /obj/item/ammo_box/tube/m44 = 4, + /obj/item/attachments/scope = 1 + ) + +/datum/outfit/loadout/skirmisher + name = "Skirmishing Explorer" + suit_store = /obj/item/gun/ballistic/automatic/smg/cg45 + backpack_contents = list( + /obj/item/ammo_box/magazine/cg45 = 2, + /obj/item/book/granter/trait/explosives = 1, + /obj/item/grenade/plastic/c4 = 1, + /obj/item/grenade/smokebomb = 2 ) // ----------------- FRUMENTARIUS --------------------- diff --git a/code/modules/jobs/job_types/ncr.dm b/code/modules/jobs/job_types/ncr.dm index 308dbd5b7f..87e3557228 100644 --- a/code/modules/jobs/job_types/ncr.dm +++ b/code/modules/jobs/job_types/ncr.dm @@ -557,11 +557,11 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good. suit = /obj/item/clothing/suit/armor/f13/trailranger belt = /obj/item/storage/belt/military/NCR_Bandolier neck = /obj/item/clothing/neck/mantle/ranger - suit_store = /obj/item/gun/ballistic/rifle/repeater/cowboy + suit_store = /obj/item/gun/ballistic/rifle/repeater/trail backpack_contents = list( /obj/item/storage/box/ration/ranger_lunch = 1, /obj/item/gun/ballistic/revolver/colt357 = 1, - /obj/item/ammo_box/tube/a357 = 4 + /obj/item/ammo_box/tube/m44 = 4 ) /datum/outfit/loadout/rangerpatrol @@ -704,13 +704,13 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good. ) /datum/outfit/loadout/combatengineerdestroyer name = "Explosives Expert" - suit_store = /obj/item/gun/ballistic/shotgun/hunting + suit_store = /obj/item/gun/ballistic/revolver/grenadelauncher backpack_contents = list( /obj/item/storage/box/ration/menu_ten = 1, + /obj/item/ammo_box/a40mm = 2, /obj/item/grenade/plastic/c4 = 1, /obj/item/book/granter/crafting_recipe/blueprint/trapper = 1, - /obj/item/book/granter/trait/explosives = 1, - /obj/item/ammo_box/shotgun/buck = 3 + /obj/item/book/granter/trait/explosives = 1 ) /datum/outfit/job/ncr/f13combatengineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) From e5fdceb90b880136e0e8b4064d1537192b680a55 Mon Sep 17 00:00:00 2001 From: "Aurelian D. Rainer" <93160383+Aurrain@users.noreply.github.com> Date: Tue, 14 Nov 2023 17:40:11 -0800 Subject: [PATCH 3/4] Update in_character_filter.txt Because for some reason the filter couldn't catch a plural of a slur. --- config/in_character_filter.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/config/in_character_filter.txt b/config/in_character_filter.txt index 9f16daffba..6f2254e203 100644 --- a/config/in_character_filter.txt +++ b/config/in_character_filter.txt @@ -10,12 +10,18 @@ kek lmao xd nigger +niggers nigga +niggas faggot +faggots fag +fags kike spic tranny +trannys +trannies ladyboy stfu kys @@ -91,4 +97,4 @@ bluepill 𓀋 𓀌 𓀍 -జ్ఞ‌ా \ No newline at end of file +జ్ఞ‌ా From d24675bb1dc81530f4fe70d0f7824a7838ae2138 Mon Sep 17 00:00:00 2001 From: BrotherHangyul <74551771+BrotherHangyul@users.noreply.github.com> Date: Wed, 15 Nov 2023 18:33:01 +0000 Subject: [PATCH 4/4] Update flamethrower.dm (#338) --- code/modules/projectiles/guns/ballistic/flamethrower.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/ballistic/flamethrower.dm b/code/modules/projectiles/guns/ballistic/flamethrower.dm index 9e67309994..5efd4aef1a 100644 --- a/code/modules/projectiles/guns/ballistic/flamethrower.dm +++ b/code/modules/projectiles/guns/ballistic/flamethrower.dm @@ -98,7 +98,7 @@ icon_state = "m2_flamethrower_on" item_state = "m2flamethrower" flags_1 = CONDUCT_1 - slowdown = 1 + slowdown = 0.4 slot_flags = null w_class = WEIGHT_CLASS_HUGE custom_materials = null