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 00000000000..44106ef93a1 Binary files /dev/null and b/modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/nanotrasen_system_inc/ammo.dmi differ 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 2365a3bb0bb..64626e017ad 100644 Binary files a/modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/nanotrasen_system_inc/pistol.dmi and b/modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/nanotrasen_system_inc/pistol.dmi differ diff --git a/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm b/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm index 0dbfcba8baf..b5698fd1deb 100644 --- a/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm +++ b/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm @@ -54,7 +54,6 @@ head = /obj/item/clothing/head/nanotrasen_consultant backpack_contents = list( /obj/item/melee/baton/telescopic = 1, - /obj/item/choice_beacon/ntc = 1, /obj/item/gun/energy/e_gun/mini = 1, ) @@ -152,4 +151,4 @@ new /obj/item/storage/photo_album/personal(src) new /obj/item/bedsheet/centcom(src) new /obj/item/storage/bag/garment/nanotrasen_consultant(src) - new /obj/item/choice_beacon/station_magistrate(src) + new /obj/item/storage/toolbox/guncase/skyrat/pistol/trappiste_small_case/firefly(src) diff --git a/modular_skyrat/modules/sec_haul/code/misc/packs.dm b/modular_skyrat/modules/sec_haul/code/misc/packs.dm index d85ffcd35ea..d4f68cfc00c 100644 --- a/modular_skyrat/modules/sec_haul/code/misc/packs.dm +++ b/modular_skyrat/modules/sec_haul/code/misc/packs.dm @@ -39,14 +39,13 @@ cost = PAYCHECK_COMMAND * 20 contains = list(/obj/item/gun/ballistic/shotgun/riot, /obj/item/storage/pouch/ammo, /obj/item/storage/belt/bandolier, /obj/item/ammo_box/advanced/s12gauge/hunter) -/datum/supply_pack/goody/renoster_shotgun - name = "Renoster Single Pack Shotgun" - desc = "When you really need to send the message across. A shotgun favoured by modern Sol Police, now at an affordable price." - cost = PAYCHECK_COMMAND * 20 +/datum/supply_pack/goody/rensoter_shotgun + name = "Renoster Shotgun Single-Pack" + desc = "A common modern shotgun used by Solarian State Police." contains = list(/obj/item/gun/ballistic/shotgun/riot/sol, /obj/item/storage/pouch/ammo, /obj/item/storage/belt/bandolier, /obj/item/ammo_box/advanced/s12gauge/rubber) + cost = PAYCHECK_COMMAND * 22 -//OVerride the price /datum/supply_pack/goody/double_barrel name = "Double-barreled Shotgun Single-Pack" desc = "Lost your beloved bunny to a demonic invasion? Clown broke in and stole your beloved gun? No worries! Get a new gun as long as you can pay the absurd fees." - cost = PAYCHECK_COMMAND * 12 + cost = PAYCHECK_COMMAND * 14 //This is outclassed by peacekeeper combat shotgun diff --git a/modular_skyrat/modules/sec_haul/code/technode/all_nodes.dm b/modular_skyrat/modules/sec_haul/code/technode/all_nodes.dm index 5915a62cbc0..cf47c59128b 100644 --- a/modular_skyrat/modules/sec_haul/code/technode/all_nodes.dm +++ b/modular_skyrat/modules/sec_haul/code/technode/all_nodes.dm @@ -68,18 +68,21 @@ design_ids += "m9mm_mag_ihdf" design_ids += "ca_flechballpoint" design_ids += "m9mm_mag" + design_ids += "c10mm_rincin" + design_ids += "s12g_antitide" . = ..() /datum/techweb_node/exotic_ammo/New() design_ids += "s12g_incinslug" design_ids += "ca_flechripper" design_ids += "sol_bolt_to_rifle" + design_ids += "c10mm_rhp" + design_ids += "c10mm_rap" . = ..() /datum/techweb_node/syndicate_basic/New() design_ids += "s12g_magnum" design_ids += "s12g_express" - design_ids += "s12g_antitide" design_ids += "s12g_ion" . = ..() diff --git a/modular_skyrat/modules/sec_haul/code/technode/sec_research.dm b/modular_skyrat/modules/sec_haul/code/technode/sec_research.dm index e706141afaf..a5f8c934808 100644 --- a/modular_skyrat/modules/sec_haul/code/technode/sec_research.dm +++ b/modular_skyrat/modules/sec_haul/code/technode/sec_research.dm @@ -433,6 +433,42 @@ ) departmental_flags = DEPARTMENT_BITFLAG_SECURITY +/datum/design/c10mm_rincin + name = "10mm Auto Speedloader Fireshot (Lethal)" + desc = "A speedloader in 10mm Auto." + id = "c10mm_rincin" + build_type = PROTOLATHE | AWAY_LATHE + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5, /datum/material/plasma = SHEET_MATERIAL_AMOUNT * 15) + build_path = /obj/item/ammo_box/c10mm/speedloader/fire + category = list( + RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO + ) + departmental_flags = DEPARTMENT_BITFLAG_SECURITY + +/datum/design/c10mm_rhp + name = "10mm Auto Speedloader Hollow Point (Very Lethal)" + desc = "A speedloader in 10mm Auto." + id = "c10mm_rhp" + build_type = PROTOLATHE | AWAY_LATHE + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5, /datum/material/titanium = SHEET_MATERIAL_AMOUNT * 15) + build_path = /obj/item/ammo_box/c10mm/speedloader/hp + category = list( + RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO + ) + departmental_flags = DEPARTMENT_BITFLAG_SECURITY + +/datum/design/c10mm_rap + name = "10mm Auto Speedloader Armor Piercing (Very Lethal)" + desc = "A speedloader in 10mm Auto." + id = "c10mm_rap" + build_type = PROTOLATHE | AWAY_LATHE + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5, /datum/material/silver = SHEET_MATERIAL_AMOUNT * 15) + build_path = /obj/item/ammo_box/c10mm/speedloader/ap + category = list( + RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO + ) + departmental_flags = DEPARTMENT_BITFLAG_SECURITY + //IDMA Gun Stuff /datum/design/caflechette name = "Flechette Rifle Magazine (lethal)" diff --git a/modular_skyrat/modules/shotgunrebalance/code/shotgun.dm b/modular_skyrat/modules/shotgunrebalance/code/shotgun.dm index f4658704ffa..8f0a5a33370 100644 --- a/modular_skyrat/modules/shotgunrebalance/code/shotgun.dm +++ b/modular_skyrat/modules/shotgunrebalance/code/shotgun.dm @@ -269,7 +269,7 @@ damage = 15 //I'd kill you if you manage to kill someone with this shit wound_bonus = 30 bare_wound_bonus = 30 - demolition_mod = 5 + demolition_mod = 2 /obj/projectile/bullet/frangible_slug/on_hit(atom/target, blocked = 0, pierce_hit) . = ..() @@ -278,9 +278,8 @@ demolition_mod = 50 damage = 30 else - demolition_mod = 5 - damage = 10 - return ..() + demolition_mod = 2 + damage = 15 /obj/item/ammo_casing/shotgun/hunter name = "hunter slug shell"