From c3f2895ea0fc95e1bf7a24d4f6cb1395015ce607 Mon Sep 17 00:00:00 2001 From: projectkepler-RU <99981766+projectkepler-ru@users.noreply.github.com> Date: Sun, 25 Aug 2024 19:47:18 +0700 Subject: [PATCH] Balance Adjustment 8 (#29560) * Update shotgun.dm * Update rifle.dm * what * Update packs.dm * yea * Update sec_research.dm * yeah * follow up 8 * insanity * snake eater --------- Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com> --- .../crates_lockers/closets/secure/security.dm | 2 - .../jobs/job_types/security_officer.dm | 1 + .../modules/aesthetics/guns/code/guns.dm | 4 +- .../nanotrasen_system_inc/magazine.dm | 26 ++++++++++++- .../nanotrasen_system_inc/pistol.dm | 35 ++++++++++++++++- .../romulus_technology/rifle.dm | 5 ++- .../nanotrasen_system_inc/ammo.dmi | Bin 0 -> 427 bytes .../nanotrasen_system_inc/pistol.dmi | Bin 1088 -> 1349 bytes .../code/nanotrasen_consultant.dm | 3 +- .../modules/sec_haul/code/misc/packs.dm | 11 +++--- .../sec_haul/code/technode/all_nodes.dm | 5 ++- .../sec_haul/code/technode/sec_research.dm | 36 ++++++++++++++++++ .../modules/shotgunrebalance/code/shotgun.dm | 7 ++-- 13 files changed, 114 insertions(+), 21 deletions(-) create mode 100644 modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/nanotrasen_system_inc/ammo.dmi diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 14751aae288..4474f1d2fec 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -108,13 +108,11 @@ /obj/structure/closet/secure_closet/security/PopulateContents() ..() new /obj/item/clothing/suit/armor/vest/alt/sec(src) - new /obj/item/storage/toolbox/guncase/skyrat/pistol/rom_flech(src) //SKYRAT EDIT ADDITION new /obj/item/clothing/head/helmet/sec(src) new /obj/item/radio/headset/headset_sec(src) new /obj/item/radio/headset/headset_sec/alt(src) new /obj/item/clothing/glasses/hud/security/sunglasses(src) new /obj/item/flashlight/seclite(src) - new /obj/item/choice_beacon/security_pistol(src) //SKYRAT EDIT ADDITION new /obj/item/clothing/gloves/tackler/security(src) // SKYRAT EDIT CHANGE - Gives Them The Blue Ones - ORIGINAL: new /obj/item/clothing/gloves/tackler(src) /obj/structure/closet/secure_closet/security/sec diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm index 31966a06c55..d0c340156c3 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/code/modules/jobs/job_types/security_officer.dm @@ -223,6 +223,7 @@ GLOBAL_LIST_EMPTY(security_officer_distribution) suit_store = /obj/item/gun/energy/disabler backpack_contents = list( /obj/item/evidencebag = 1, + /obj/item/choice_beacon/security_pistol = 1, //SKYRAT ADDITION ) belt = /obj/item/modular_computer/pda/security ears = /obj/item/radio/headset/headset_sec/alt diff --git a/modular_skyrat/modules/aesthetics/guns/code/guns.dm b/modular_skyrat/modules/aesthetics/guns/code/guns.dm index a5b89ebc1f3..0d5d52a82b3 100644 --- a/modular_skyrat/modules/aesthetics/guns/code/guns.dm +++ b/modular_skyrat/modules/aesthetics/guns/code/guns.dm @@ -77,7 +77,7 @@ /obj/item/gun/ballistic/shotgun/riot name = "woodstock shotgun" - desc = "A sturdy shotgun with a short magazine tube, commonly used by lavaland hunters and riot police. Features a fixed tactical stock designed for the terran feels." + desc = "A sturdy shotgun with a longer magazine and a fixed tactical stock designed for non-lethal riot control. Often found in the hand of a lavaland hunter. Vaguely reminds you of hunting back in Sol does it not?" fire_delay = 6 //We slighly bump this up because thats a good idea sawn_desc = "Come with me if you want to live." @@ -91,7 +91,7 @@ inhand_icon_state = "shotgun_combat" inhand_x_dimension = 32 inhand_y_dimension = 32 - fire_delay = 7 + fire_delay = 7 w_class = WEIGHT_CLASS_BULKY /obj/item/gun/ballistic/shotgun/automatic/combat/compact diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/nanotrasen_system_inc/magazine.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/nanotrasen_system_inc/magazine.dm index 7d1eea899ec..a858ed012c5 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/nanotrasen_system_inc/magazine.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/nanotrasen_system_inc/magazine.dm @@ -80,7 +80,7 @@ icon_state = "38" multiple_sprites = AMMO_BOX_PER_BULLET ammo_band_icon = "+38_ammo_band" - + multitype = FALSE custom_premium_price = 50 w_class = WEIGHT_CLASS_SMALL @@ -98,3 +98,27 @@ desc = "Designed to quickly reload revolvers." ammo_type = /obj/item/ammo_casing/c10mm/fire ammo_band_color = "#c41d1a" + +/obj/item/ammo_box/c10mm/speedloader/ap + + name = "speed loader (10mm Auto Armor Penetrating)" + desc = "Designed to quickly reload revolvers." + ammo_type = /obj/item/ammo_casing/c10mm/ap + ammo_band_color = "#1ac43f" + +/obj/item/ammo_box/c10mm/speedloader/hp + + name = "speed loader (10mm Auto Hollow Point)" + desc = "Designed to quickly reload revolvers." + ammo_type = /obj/item/ammo_casing/c10mm/hp + ammo_band_color = "#df00ae" + +/obj/item/ammo_box/magazine/firefly + name = "pistol magazine (.117 Incapacitator)" + icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/nanotrasen_system_inc/ammo.dmi' + multiple_sprites = AMMO_BOX_FULL_EMPTY + icon_state = "firefly" + multitype = FALSE + ammo_type = /obj/item/ammo_casing/shotgun/antitide + max_ammo = 10 + caliber = CALIBER_SHOTGUN diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/nanotrasen_system_inc/pistol.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/nanotrasen_system_inc/pistol.dm index 0fee38047fa..bca2db28727 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/nanotrasen_system_inc/pistol.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/nanotrasen_system_inc/pistol.dm @@ -59,9 +59,42 @@ burst_size = 3 spawn_magazine_type = /obj/item/ammo_box/magazine/m9mm/stendo -/obj/item/gun/ballistic/automatic/pistol/nt_glock/empty +//Magistrate Pistol + +/obj/item/storage/toolbox/guncase/skyrat/pistol/trappiste_small_case/firefly + name = "MX-7C Stun Pistol" + + weapon_to_spawn = /obj/item/gun/ballistic/automatic/pistol/firefly/empty + +/obj/item/storage/toolbox/guncase/skyrat/pistol/trappiste_small_case/firefly/PopulateContents() + new weapon_to_spawn (src) + + generate_items_inside(list( + /obj/item/ammo_box/magazine/firefly = 3, + ), src) + +/obj/item/gun/ballistic/automatic/pistol/firefly + name = "\improper MX-7C 'Firefly'" + desc = "NanoTrasen Experimental Model 7 Compact, A rare pistol chambered in a .117 electrode cartridge. It has has a small magazine capacity." + icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/nanotrasen_system_inc/pistol.dmi' + icon_state = "firefly" + w_class = WEIGHT_CLASS_NORMAL + spread = 10 + fire_sound = 'sound/weapons/gun/pistol/shot_alt.ogg' + rack_sound = 'sound/weapons/gun/pistol/rack.ogg' + lock_back_sound = 'sound/weapons/gun/pistol/slide_lock.ogg' + bolt_drop_sound = 'sound/weapons/gun/pistol/slide_drop.ogg' + pin = /obj/item/firing_pin + spawn_magazine_type = /obj/item/ammo_box/magazine/firefly + accepted_magazine_type = /obj/item/ammo_box/magazine/firefly + +/obj/item/gun/ballistic/automatic/pistol/firefly/give_manufacturer_examine() + AddElement(/datum/element/manufacturer_examine, COMPANY_NANOTRASEN) + +/obj/item/gun/ballistic/automatic/pistol/firefly/empty spawnwithmagazine = FALSE + // Revolver /obj/item/gun/ballistic/revolver/nt_revolver diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/rifle.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/rifle.dm index c8ffe4ea202..b61c915bf6b 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/rifle.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/rifle.dm @@ -143,7 +143,8 @@ burst_size = 2 fire_delay = 2 spread = 5 - pin = /obj/item/firing_pin/alert_level +// pin = /obj/item/firing_pin/alert_level this does work but it's a conceptual failure + pin = /obj/item/firing_pin fire_sound = 'modular_skyrat/modules/modular_weapons/sounds/smg_light.ogg' accepted_magazine_type = /obj/item/ammo_box/magazine/caflechette @@ -239,7 +240,7 @@ weapon_weight = WEAPON_LIGHT burst_size = 3 spread = 0 - pin = /obj/item/firing_pin + unfolded_spread = 0 folded_spread = 7 folded_recoil = 2 diff --git a/modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/nanotrasen_system_inc/ammo.dmi b/modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/nanotrasen_system_inc/ammo.dmi new file mode 100644 index 0000000000000000000000000000000000000000..44106ef93a1d6f0a4f948f214200bf2b30d944af GIT binary patch literal 427 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|etpJ}8*8>L*SlUFcN@lpTK>Ejx z1bt11u$aQ$sSEFIvwd~Dxx8t{`rXI6ee{6Jt{z;)2-L+`666=m;PC858jw?66%tY6 zl3JWxlvz-cnV-kNP%$Sste~j$`T^`igZLGR^g@i`ZiK8>arp%blmAH8IWnb;H zCl#X#v+^7{{T5FZjrkjMAdiiq!NDwSqs~fSpfgr@x;Tb-bS5WAur6V6Q&m;1sbOR}P(5C~`pluOWX(C0T0 zS+Kl#l4wE-OG(4TyDQf*EVglApYnUsr-TC<{1+JADjWC=PBE7loH)(Qpitt&?P{D` Q3v@Gsr>mdKI;Vst0Mx;tz5oCK literal 0 HcmV?d00001 diff --git a/modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/nanotrasen_system_inc/pistol.dmi b/modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/nanotrasen_system_inc/pistol.dmi index 2365a3bb0bb55abd5e24e701fca4335fe577211f..64626e017ad406a5ed5cd7b14bcb0eb83559d15a 100644 GIT binary patch delta 1237 zcmV;`1Sbl007JY0N35#ASN)S03jM6 zEtvoSnPb#<00001bW%=J06^y0W&i*Hzj{3*@PdnQ(o}&oU<{Cr%6OXRCt_!?U{>qqA(CZA?UW--GYXOrtMa1ZMEC~ z|G=G@1VoJxu|T$GF4Yq`Be_f-)iH_~hGG6g;<){!PfTCLv4{;KNs_V+C*3jh$`#X$ z0FsV^lf)wIgP6qbm?_|lX@HD9Xo>N>Nx<*NRp5eGR{{G4Kf)j=!WJ~2CPG}j=VJa1j%~p(48t%C(>Knd z&cR8an7$AqDT`H;$)s$Sqct`Caqi6yZQ;##<4@cTv;Ge~_Jj+;ya`!(DYeGzmK6(#Lf6NMcz!pQre6 z2uh{kPv?kKS}FDP1gEt25xjla9e)}G-EkEF2mfFa}ZQhY#j>bFxwz^C`cL9FtjXUWoDT^8?u@9!I3bQY9KZ?NL0Hk*wqPG84FZ4tkcC4qIYkB^UHtvU-v zSnz{`YUAqUb#y(dIfL7+gu@`A2}3OZ_Fe>&*j3eUvmnlbvO1?JgZ)<#&%(%+H={p4 zKXvmh4GvXuV0-W zMGo`pM0d8d$&78$#2MRO*r_(ZjgM`?Fieeql=WD0Vs)f!00000NkvXXu0mjf&@DsF delta 974 zcmV;<12O!?3cv`E7Y<+u0{{R3t@(+o0001KktJ<^<)8jd00001bW%=J06^y0W&i*H zu6k5hbVOxyV{&P5bZKvH004NLQ&wkvrS$zDa%Uz1K_f)0klizv+7mgSa-Af9)J_mE48#0`gyH;2m&~IGLlJ636h++_ zPTDi{%$Au(0MSChI5G(HAmY%TNdRkR8j3FzgsRb@izEzDcw=T7$}bcY-Nna*H)f{6 z!Y}iqmxdRN-!CytWlrI6@ImOK>CsZb2M{LxCm4LNt*wTT5$vaMwR_QxBsi^DI2dk! z?P4PldV+E2vmmWOA7|M3ZLM(?@cXgzTyVGZ*w6bJ20`Jsp#C=DWhyN4jFHM`h#6Bjr)UZ!TrHI;r`&A_})DNzn^>01^0W8 z{k)&y|EE9beIGILy+24xfd!Z2yPpx<+F}CVw+O>94C5KUeh+wFkV{9gEHAFSL8+0a zr;dUz1EvJ+xirgiB!dA0!^_u7kSSHAs;W|;2yU;hb?qv6c-NcQ{qoE`ra8)A46Q(4IrV6v?v=+Z0QwRE3VUEU}OuA5hG) za;o87g4r9Y6#z_aVX*3!kXX~X=VjA(NAsS7c_0# w&=Q3z`zw=-`aczlxNB{r;07*qoM6N<$f+|