diff --git a/code/datums/factions/clf.dm b/code/datums/factions/clf.dm index 10d7a64e4e..8cd3756c41 100644 --- a/code/datums/factions/clf.dm +++ b/code/datums/factions/clf.dm @@ -60,7 +60,7 @@ list("SIDEARMS", 0, null, null, null), list("VP70 Combat Pistol", 15, /obj/item/weapon/gun/pistol/vp70, null, VENDOR_ITEM_REGULAR), list("Beretta 92FS Pistol", 15, /obj/item/weapon/gun/pistol/b92fs, null, VENDOR_ITEM_REGULAR), - list("CMB Spearhead Autorevolver", 15, /obj/item/weapon/gun/revolver/cmb, null, VENDOR_ITEM_REGULAR), + list("CMB Spearhead Autorevolver", 15, /obj/item/weapon/gun/revolver/spearhead, null, VENDOR_ITEM_REGULAR), list("Holdout Pistol", 10, /obj/item/weapon/gun/pistol/holdout, null, VENDOR_ITEM_REGULAR), list("KT-42 Automag", 15, /obj/item/weapon/gun/pistol/kt42, null, VENDOR_ITEM_REGULAR), list("S&W .357 Revolver", 15, /obj/item/weapon/gun/revolver/small, null, VENDOR_ITEM_REGULAR), @@ -69,8 +69,8 @@ list("VP70 Magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/vp70, null, VENDOR_ITEM_REGULAR), list("Beretta 92FS Magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/b92fs, null, VENDOR_ITEM_REGULAR), list("KT-42 Magazine (.44)", 5, /obj/item/ammo_magazine/pistol/kt42, null, VENDOR_ITEM_REGULAR), - list("Spearhead Speed Loader (.357)", 10, /obj/item/ammo_magazine/revolver/cmb, VENDOR_ITEM_REGULAR), - list("Hollowpoint Spearhead Speed Loader (.357)", 5, /obj/item/ammo_magazine/revolver/cmb, VENDOR_ITEM_REGULAR), + list("Spearhead Speed Loader (.357)", 10, /obj/item/ammo_magazine/revolver/spearhead, VENDOR_ITEM_REGULAR), + list("Hollowpoint Spearhead Speed Loader (.357)", 5, /obj/item/ammo_magazine/revolver/spearhead, VENDOR_ITEM_REGULAR), list("S&W Speed Loader (.357)", 5, /obj/item/ammo_magazine/revolver/small, null, VENDOR_ITEM_REGULAR), list("Tiny Pistol Magazine (.22)", 5, /obj/item/ammo_magazine/pistol/holdout, null, VENDOR_ITEM_REGULAR), @@ -128,7 +128,7 @@ list("SIDEARMS", -1, null, null), list("VP70 Combat Pistol", 20, /obj/item/weapon/gun/pistol/vp70, VENDOR_ITEM_REGULAR), list("Beretta 92FS Pistol", 20, /obj/item/weapon/gun/pistol/b92fs, VENDOR_ITEM_REGULAR), - list("CMB Spearhead Autorevolver", 20, /obj/item/weapon/gun/revolver/cmb, VENDOR_ITEM_REGULAR), + list("CMB Spearhead Autorevolver", 20, /obj/item/weapon/gun/revolver/spearhead, VENDOR_ITEM_REGULAR), list("Holdout Pistol", 20, /obj/item/weapon/gun/pistol/holdout, VENDOR_ITEM_REGULAR), list("KT-42 Automag", 20, /obj/item/weapon/gun/pistol/kt42, VENDOR_ITEM_REGULAR), list("S&W .357 Revolver", 20, /obj/item/weapon/gun/revolver/small, VENDOR_ITEM_REGULAR), @@ -137,8 +137,8 @@ list("VP70 Magazine (9mm)", 40, /obj/item/ammo_magazine/pistol/vp70, VENDOR_ITEM_REGULAR), list("Beretta 92FS Magazine (9mm)", 40, /obj/item/ammo_magazine/pistol/b92fs, VENDOR_ITEM_REGULAR), list("KT-42 Magazine (.44)", 40, /obj/item/ammo_magazine/pistol/kt42, VENDOR_ITEM_REGULAR), - list("Spearhead Speed Loader (.357)", 40, /obj/item/ammo_magazine/revolver/cmb, VENDOR_ITEM_REGULAR), - list("Hollowpoint Spearhead Speed Loader (.357)", 40, /obj/item/ammo_magazine/revolver/cmb, VENDOR_ITEM_REGULAR), + list("Spearhead Speed Loader (.357)", 40, /obj/item/ammo_magazine/revolver/spearhead, VENDOR_ITEM_REGULAR), + list("Hollowpoint Spearhead Speed Loader (.357)", 40, /obj/item/ammo_magazine/revolver/spearhead, VENDOR_ITEM_REGULAR), list("S&W Speed Loader (.357)", 40, /obj/item/ammo_magazine/revolver/small, VENDOR_ITEM_REGULAR), list("Tiny Pistol Magazine (.22)", 40, /obj/item/ammo_magazine/pistol/holdout, VENDOR_ITEM_REGULAR), diff --git a/code/datums/supply_packs/black_market.dm b/code/datums/supply_packs/black_market.dm index 89d4220970..50198a9eae 100644 --- a/code/datums/supply_packs/black_market.dm +++ b/code/datums/supply_packs/black_market.dm @@ -410,12 +410,12 @@ Additionally, weapons that are way too good to put in the basically-flavor black /datum/supply_packs/contraband/seized/cmb name = "CMB Spearhead revolver (x5 magazines included)" contains = list( - /obj/item/weapon/gun/revolver/cmb, - /obj/item/ammo_magazine/revolver/cmb, - /obj/item/ammo_magazine/revolver/cmb, - /obj/item/ammo_magazine/revolver/cmb, - /obj/item/ammo_magazine/revolver/cmb, - /obj/item/ammo_magazine/revolver/cmb, + /obj/item/weapon/gun/revolver/spearhead, + /obj/item/ammo_magazine/revolver/spearhead, + /obj/item/ammo_magazine/revolver/spearhead, + /obj/item/ammo_magazine/revolver/spearhead, + /obj/item/ammo_magazine/revolver/spearhead, + /obj/item/ammo_magazine/revolver/spearhead, ) dollar_cost = 20 containertype = /obj/structure/largecrate/black_market diff --git a/code/game/objects/effects/spawners/random.dm b/code/game/objects/effects/spawners/random.dm index d302e7794f..82192a9ca3 100644 --- a/code/game/objects/effects/spawners/random.dm +++ b/code/game/objects/effects/spawners/random.dm @@ -329,7 +329,7 @@ var/mags_min = 1 var/list/guns = list( /obj/item/weapon/gun/pistol/b92fs = /obj/item/ammo_magazine/pistol/b92fs, - /obj/item/weapon/gun/revolver/cmb = /obj/item/ammo_magazine/revolver/cmb, + /obj/item/weapon/gun/revolver/spearhead = /obj/item/ammo_magazine/revolver/spearhead, /obj/item/weapon/gun/pistol/highpower = /obj/item/ammo_magazine/pistol/highpower, /obj/item/weapon/gun/pistol/m1911 = /obj/item/ammo_magazine/pistol/m1911, /obj/item/weapon/gun/revolver/small = /obj/item/ammo_magazine/revolver/small, @@ -388,9 +388,9 @@ /obj/item/weapon/gun/pistol/b92fs = /obj/item/ammo_magazine/pistol/b92fs, /obj/item/weapon/gun/pistol/b92fs = /obj/item/ammo_magazine/pistol/b92fs, /obj/item/weapon/gun/pistol/b92fs = /obj/item/ammo_magazine/pistol/b92fs, - /obj/item/weapon/gun/revolver/cmb = /obj/item/ammo_magazine/revolver/cmb, - /obj/item/weapon/gun/revolver/cmb = /obj/item/ammo_magazine/revolver/cmb, - /obj/item/weapon/gun/revolver/cmb = /obj/item/ammo_magazine/revolver/cmb, + /obj/item/weapon/gun/revolver/spearhead = /obj/item/ammo_magazine/revolver/spearhead, + /obj/item/weapon/gun/revolver/spearhead = /obj/item/ammo_magazine/revolver/spearhead, + /obj/item/weapon/gun/revolver/spearhead = /obj/item/ammo_magazine/revolver/spearhead, /obj/item/weapon/gun/pistol/highpower = /obj/item/ammo_magazine/pistol/highpower, /obj/item/weapon/gun/pistol/highpower = /obj/item/ammo_magazine/pistol/highpower, /obj/item/weapon/gun/pistol/highpower = /obj/item/ammo_magazine/pistol/highpower, diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index f5e37be408..85d5be83f8 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -448,8 +448,8 @@ new /obj/item/handcuffs(src) new /obj/item/handcuffs(src) new /obj/item/handcuffs(src) - new /obj/item/ammo_magazine/revolver/cmb(src) - new /obj/item/ammo_magazine/revolver/cmb(src) + new /obj/item/ammo_magazine/revolver/spearhead(src) + new /obj/item/ammo_magazine/revolver/spearhead(src) /obj/item/storage/belt/security/MP/CMB/full/highpower/fill_preset_inventory() new /obj/item/weapon/gun/energy/taser(src) diff --git a/code/game/objects/items/storage/misc.dm b/code/game/objects/items/storage/misc.dm index f50627a3bf..f2994eb705 100644 --- a/code/game/objects/items/storage/misc.dm +++ b/code/game/objects/items/storage/misc.dm @@ -181,6 +181,20 @@ new /obj/item/ammo_magazine/pistol/highpower/black(src) new /obj/item/ammo_magazine/pistol/highpower/black(src) +/obj/item/storage/box/Spearhead_loadout + name = "Spearhead Armoury storage case" + desc = "A relatively large storage case containing a loaded Spearhead Armoury autorevolver and two additional speedloaders." + icon = 'icons/obj/items/storage.dmi' + icon_state = "matebacase" + w_class = SIZE_LARGE + max_w_class = SIZE_MEDIUM + storage_slots = 3 + +/obj/item/storage/box/Spearhead_loadout/fill_preset_inventory() + new /obj/item/weapon/gun/revolver/spearhead/black(src) + new /obj/item/ammo_magazine/revolver/spearhead(src) + new /obj/item/ammo_magazine/revolver/spearhead(src) + /obj/item/storage/box/M1911_loadout name = "M1911 storage case" desc = "A relatively large storage case containing a loaded M1911 and two additional magazines." diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index cfe7531f5f..9b19fb5b4e 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -377,7 +377,7 @@ /obj/item/weapon/gun/pistol/m1911 = /obj/item/ammo_magazine/pistol/m1911, /obj/item/weapon/gun/pistol/heavy = /obj/item/ammo_magazine/pistol/heavy, /obj/item/weapon/gun/revolver/small = /obj/item/ammo_magazine/revolver/small, - /obj/item/weapon/gun/revolver/cmb = /obj/item/ammo_magazine/revolver/cmb, + /obj/item/weapon/gun/revolver/spearhead = /obj/item/ammo_magazine/revolver/spearhead, /obj/item/weapon/gun/shotgun/merc = /obj/item/ammo_magazine/handful/shotgun/buckshot, /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb = /obj/item/ammo_magazine/handful/shotgun/buckshot, /obj/item/weapon/gun/smg/mp27 = /obj/item/ammo_magazine/smg/mp27, diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 6801857470..8db51045c5 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -756,6 +756,11 @@ var/global/list/gear_datums_by_name = list() path = /obj/item/storage/box/HG45_marine_loadout allowed_origins = USCM_ORIGINS +/datum/gear/weapon/spearhead + display_name = "Spearhead Armoury Autorevolver" + path = /obj/item/storage/box/Spearhead_loadout + allowed_origins = USCM_ORIGINS + /datum/gear/weapon/m2100_machete display_name = "M2100 Machete" path = /obj/item/storage/large_holster/machete/arnold/weak diff --git a/code/modules/gear_presets/_select_equipment.dm b/code/modules/gear_presets/_select_equipment.dm index 6aefa9a673..3d4f0f1620 100644 --- a/code/modules/gear_presets/_select_equipment.dm +++ b/code/modules/gear_presets/_select_equipment.dm @@ -893,8 +893,8 @@ var/list/rebel_rifles = list( new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/b92fs(new_human), WEAR_IN_BACK) if(1) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/cmb(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/spearhead(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead(new_human), WEAR_IN_BACK) if(2) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower(new_human), WEAR_IN_BACK) diff --git a/code/modules/gear_presets/cmb.dm b/code/modules/gear_presets/cmb.dm index b0dd142cce..c348f63fae 100644 --- a/code/modules/gear_presets/cmb.dm +++ b/code/modules/gear_presets/cmb.dm @@ -77,9 +77,9 @@ switch(choice) if(1 to 6) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/cmb, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/spearhead, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/CMB/full/revolver, WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK) @@ -111,9 +111,9 @@ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun, WEAR_IN_R_STORE) if(10) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/cmb, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/spearhead, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/CMB/full/revolver, WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1, WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK) @@ -147,9 +147,9 @@ new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform, WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/cmb, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/spearhead, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB/marshal, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb/m3717, WEAR_J_STORE) @@ -227,9 +227,9 @@ load_name(new_human) //backpack new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/security, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/spearhead, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/autopsy_scanner, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/radio, WEAR_IN_BACK) diff --git a/code/modules/projectiles/guns/revolvers.dm b/code/modules/projectiles/guns/revolvers.dm index 90e2e37e71..97ef3bf1ad 100644 --- a/code/modules/projectiles/guns/revolvers.dm +++ b/code/modules/projectiles/guns/revolvers.dm @@ -699,7 +699,7 @@ //------------------------------------------------------- //MARSHALS REVOLVER //Spearhead exists in Alien cannon. -/obj/item/weapon/gun/revolver/cmb +/obj/item/weapon/gun/revolver/spearhead name = "\improper Spearhead Armoury autorevolver" desc = "A semi-automatic revolver chambered in .357 commonly issued to Colonial Marshals." icon = 'icons/obj/items/weapons/guns/guns_by_faction/colony.dmi' @@ -709,8 +709,8 @@ fire_sounds = list('sound/weapons/gun_cmb_1.ogg', 'sound/weapons/gun_cmb_2.ogg') fire_rattle = 'sound/weapons/gun_cmb_rattle.ogg' cylinder_click = list('sound/weapons/handling/gun_cmb_click1.ogg', 'sound/weapons/handling/gun_cmb_click2.ogg') - current_mag = /obj/item/ammo_magazine/internal/revolver/cmb - force = 12 + current_mag = /obj/item/ammo_magazine/internal/revolver/spearhead + force = 15 attachable_allowed = list( /obj/item/attachable/suppressor, // Muzzle /obj/item/attachable/extended_barrel, @@ -724,21 +724,21 @@ /obj/item/attachable/lasersight, ) -/obj/item/weapon/gun/revolver/cmb/click_empty(mob/user) +/obj/item/weapon/gun/revolver/spearhead/click_empty(mob/user) if(user) to_chat(user, SPAN_WARNING("*click*")) playsound(user, pick('sound/weapons/handling/gun_cmb_click1.ogg', 'sound/weapons/handling/gun_cmb_click2.ogg'), 25, 1, 5) //5 tile range else playsound(src, pick('sound/weapons/handling/gun_cmb_click1.ogg', 'sound/weapons/handling/gun_cmb_click2.ogg'), 25, 1, 5) -/obj/item/weapon/gun/revolver/cmb/Fire(atom/target, mob/living/user, params, reflex = 0, dual_wield) +/obj/item/weapon/gun/revolver/spearhead/Fire(atom/target, mob/living/user, params, reflex = 0, dual_wield) playsound('sound/weapons/gun_cmb_bass.ogg') // badass shooting bass return ..() -/obj/item/weapon/gun/revolver/cmb/set_gun_attachment_offsets() +/obj/item/weapon/gun/revolver/spearhead/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 29, "muzzle_y" = 22,"rail_x" = 11, "rail_y" = 25, "under_x" = 20, "under_y" = 18, "stock_x" = 20, "stock_y" = 18) -/obj/item/weapon/gun/revolver/cmb/set_gun_config_values() +/obj/item/weapon/gun/revolver/spearhead/set_gun_config_values() ..() set_fire_delay(FIRE_DELAY_TIER_6) accuracy_mult = BASE_ACCURACY_MULT + HIT_ACCURACY_MULT_TIER_4 @@ -749,5 +749,12 @@ recoil = RECOIL_AMOUNT_TIER_5 recoil_unwielded = RECOIL_AMOUNT_TIER_3 -/obj/item/weapon/gun/revolver/cmb/hollowpoint - current_mag = /obj/item/ammo_magazine/internal/revolver/cmb/hollowpoint +/obj/item/weapon/gun/revolver/spearhead/hollowpoint + current_mag = /obj/item/ammo_magazine/internal/revolver/spearhead/hollowpoint + +/obj/item/weapon/gun/revolver/spearhead/black + name = "\improper Spearhead Armoury autorevolver" + desc = "A semi-automatic revolver chambered in .357 commonly issued to Colonial Marshals, though this version has been modified with a black metal finish." + icon = 'icons/obj/items/weapons/guns/guns_by_faction/colony.dmi' + icon_state = "spearhead_black" + item_state = "spearhead_black" diff --git a/code/modules/projectiles/magazines/revolvers.dm b/code/modules/projectiles/magazines/revolvers.dm index 0fbbf1bf15..8b32587c7a 100644 --- a/code/modules/projectiles/magazines/revolvers.dm +++ b/code/modules/projectiles/magazines/revolvers.dm @@ -78,7 +78,7 @@ max_rounds = 6 gun_type = /obj/item/weapon/gun/revolver/small -/obj/item/ammo_magazine/revolver/cmb +/obj/item/ammo_magazine/revolver/spearhead name = "\improper Spearhead speed loader (.357)" desc = "A speedloader of 6 FMJ .357 bullets, uncommonly issued to Colonial Marshals due to overpenetration risks." default_ammo = /datum/ammo/bullet/revolver/small @@ -86,9 +86,9 @@ icon = 'icons/obj/items/weapons/guns/ammo_by_faction/colony.dmi' icon_state = "cmb" max_rounds = 6 - gun_type = /obj/item/weapon/gun/revolver/cmb + gun_type = /obj/item/weapon/gun/revolver/spearhead -/obj/item/ammo_magazine/revolver/cmb/hollowpoint +/obj/item/ammo_magazine/revolver/spearhead/hollowpoint name = "\improper Spearhead speed loader (.357)" desc = "A speedloader of 6 hollowpoint .357 bullets, commonly issued to Colonial Marshals to both prevent overpenetration and improve performance against unarmored criminals or wildlife." default_ammo = /datum/ammo/bullet/revolver/small/hollowpoint @@ -205,15 +205,15 @@ //------------------------------------------------------- //MARSHALS REVOLVER //Spearhead exists in Alien cannon. -/obj/item/ammo_magazine/internal/revolver/cmb +/obj/item/ammo_magazine/internal/revolver/spearhead default_ammo = /datum/ammo/bullet/revolver/small caliber = ".357" - gun_type = /obj/item/weapon/gun/revolver/cmb + gun_type = /obj/item/weapon/gun/revolver/spearhead -/obj/item/ammo_magazine/internal/revolver/cmb/hollowpoint +/obj/item/ammo_magazine/internal/revolver/spearhead/hollowpoint default_ammo = /datum/ammo/bullet/revolver/small/hollowpoint caliber = ".357" - gun_type = /obj/item/weapon/gun/revolver/cmb + gun_type = /obj/item/weapon/gun/revolver/spearhead //------------------------------------------------------- //BIG GAME HUNTER'S REVOLVER diff --git a/icons/mob/humans/onmob/items_lefthand_1.dmi b/icons/mob/humans/onmob/items_lefthand_1.dmi index b40e021fba..9d841a0f8b 100644 Binary files a/icons/mob/humans/onmob/items_lefthand_1.dmi and b/icons/mob/humans/onmob/items_lefthand_1.dmi differ diff --git a/icons/mob/humans/onmob/items_righthand_1.dmi b/icons/mob/humans/onmob/items_righthand_1.dmi index afa1e2f753..80d160f57b 100644 Binary files a/icons/mob/humans/onmob/items_righthand_1.dmi and b/icons/mob/humans/onmob/items_righthand_1.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_faction/colony.dmi b/icons/obj/items/weapons/guns/guns_by_faction/colony.dmi index 9890d65cad..feca8443db 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_faction/colony.dmi and b/icons/obj/items/weapons/guns/guns_by_faction/colony.dmi differ diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index c2236eb87a..911f23b712 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -1662,7 +1662,7 @@ /area/bigredv2/outside/marshal_office) "afo" = ( /obj/structure/surface/rack, -/obj/item/weapon/gun/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, /turf/open/floor{ dir = 8; icon_state = "vault" @@ -1670,7 +1670,7 @@ /area/bigredv2/outside/marshal_office) "afp" = ( /obj/structure/surface/rack, -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/ammo_magazine/revolver/spearhead, /turf/open/floor{ dir = 8; icon_state = "vault" @@ -1681,7 +1681,7 @@ /obj/structure/machinery/light{ dir = 1 }, -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/ammo_magazine/revolver/spearhead, /turf/open/floor{ dir = 8; icon_state = "vault" @@ -31566,7 +31566,7 @@ "miD" = ( /obj/effect/decal/cleanable/blood, /obj/effect/landmark/corpsespawner/security/marshal, -/obj/item/weapon/gun/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, /turf/open/mars_cave{ icon_state = "mars_cave_2" }, diff --git a/maps/map_files/BigRed/sprinkles/10.prison_breakout.dmm b/maps/map_files/BigRed/sprinkles/10.prison_breakout.dmm index e2e995af42..744ef04af7 100644 --- a/maps/map_files/BigRed/sprinkles/10.prison_breakout.dmm +++ b/maps/map_files/BigRed/sprinkles/10.prison_breakout.dmm @@ -223,7 +223,7 @@ /area/bigredv2/outside/marshal_office) "aF" = ( /obj/structure/surface/rack, -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/ammo_magazine/revolver/spearhead, /turf/open/floor{ dir = 8; icon_state = "vault" @@ -231,7 +231,7 @@ /area/bigredv2/outside/marshal_office) "aG" = ( /obj/structure/surface/rack, -/obj/item/weapon/gun/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, /turf/open/floor{ dir = 8; icon_state = "vault" @@ -242,7 +242,7 @@ /obj/structure/machinery/light{ dir = 1 }, -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/ammo_magazine/revolver/spearhead, /turf/open/floor{ dir = 8; icon_state = "vault" diff --git a/maps/map_files/BigRed/sprinkles/20.etatunnel_open.dmm b/maps/map_files/BigRed/sprinkles/20.etatunnel_open.dmm index 633a79f6ac..9666ca41a4 100644 --- a/maps/map_files/BigRed/sprinkles/20.etatunnel_open.dmm +++ b/maps/map_files/BigRed/sprinkles/20.etatunnel_open.dmm @@ -374,7 +374,7 @@ /area/bigredv2/outside/lz2_south_cas) "Jy" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/weapon/gun/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, /obj/item/device/flashlight/lamp/on{ pixel_x = -5; pixel_y = 17 diff --git a/maps/map_files/CORSAT/Corsat.dmm b/maps/map_files/CORSAT/Corsat.dmm index b9456bc4f3..a0a3bb64d9 100644 --- a/maps/map_files/CORSAT/Corsat.dmm +++ b/maps/map_files/CORSAT/Corsat.dmm @@ -41809,7 +41809,7 @@ /area/corsat/sigma/southeast/datalab) "gys" = ( /obj/structure/surface/rack, -/obj/item/weapon/gun/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, /turf/open/floor/corsat{ icon_state = "red" }, @@ -56944,10 +56944,10 @@ /area/corsat/sigma/hangar/security) "rRh" = ( /obj/structure/surface/rack, -/obj/item/ammo_magazine/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/ammo_magazine/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead, /turf/open/floor/corsat{ dir = 6; icon_state = "red" diff --git a/maps/map_files/DesertDam/Desert_Dam.dmm b/maps/map_files/DesertDam/Desert_Dam.dmm index 6325533e9b..cc04cfc015 100644 --- a/maps/map_files/DesertDam/Desert_Dam.dmm +++ b/maps/map_files/DesertDam/Desert_Dam.dmm @@ -4609,14 +4609,14 @@ /area/desert_dam/interior/lab_northeast/east_lab_security_armory) "anS" = ( /obj/structure/surface/table/reinforced, -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/ammo_magazine/revolver/spearhead, /turf/open/floor/prison{ icon_state = "darkredfull2" }, /area/desert_dam/interior/lab_northeast/east_lab_security_armory) "anT" = ( /obj/structure/surface/rack, -/obj/item/weapon/gun/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, /turf/open/floor/prison{ icon_state = "darkredfull2" }, @@ -19966,7 +19966,7 @@ /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_wilderness) "bkG" = ( -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/ammo_magazine/revolver/spearhead, /obj/structure/surface/table/woodentable/fancy, /turf/open/floor/interior/wood/alt, /area/desert_dam/building/security/marshals_office) @@ -31817,13 +31817,13 @@ /area/desert_dam/building/security/armory) "bYq" = ( /obj/structure/surface/rack, -/obj/item/ammo_magazine/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb{ +/obj/item/ammo_magazine/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead{ pixel_x = 6; pixel_y = -4 }, -/obj/item/ammo_magazine/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb{ +/obj/item/ammo_magazine/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead{ pixel_x = 6; pixel_y = -4 }, @@ -43409,7 +43409,7 @@ /area/desert_dam/building/security/armory) "cJv" = ( /obj/structure/surface/rack, -/obj/item/weapon/gun/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, /turf/open/floor/prison{ icon_state = "darkredfull2" }, diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/20.poolparty.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/20.poolparty.dmm index 63fb17b8f8..5ba86e60f7 100644 --- a/maps/map_files/FOP_v3_Sciannex/sprinkles/20.poolparty.dmm +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/20.poolparty.dmm @@ -1357,7 +1357,7 @@ pixel_y = -2 }, /obj/item/weapon/gun/pistol/heavy, -/obj/item/weapon/gun/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, /turf/open/floor/wood, /area/template_noop) "We" = ( diff --git a/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm b/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm index e406258040..7b1a34d0ec 100644 --- a/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm +++ b/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm @@ -10309,7 +10309,7 @@ }, /area/ice_colony/surface/command/control/office) "aDb" = ( -/obj/item/weapon/gun/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ icon_state = "dark2" @@ -26765,8 +26765,8 @@ /area/ice_colony/underground/security/detective) "bCc" = ( /obj/structure/surface/table/woodentable, -/obj/item/weapon/gun/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead, /turf/open/floor/wood, /area/ice_colony/underground/security/marshal) "bCd" = ( @@ -32159,8 +32159,8 @@ /area/ice_colony/underground/maintenance/security) "bRx" = ( /obj/structure/surface/rack, -/obj/item/weapon/gun/revolver/cmb, -/obj/item/weapon/gun/revolver/cmb{ +/obj/item/weapon/gun/revolver/spearhead, +/obj/item/weapon/gun/revolver/spearhead{ pixel_x = 6; pixel_y = -4 }, @@ -32365,13 +32365,13 @@ /obj/structure/machinery/light{ dir = 8 }, -/obj/item/ammo_magazine/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb{ +/obj/item/ammo_magazine/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead{ pixel_x = 6; pixel_y = -4 }, -/obj/item/ammo_magazine/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb{ +/obj/item/ammo_magazine/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead{ pixel_x = 6; pixel_y = -4 }, diff --git a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm index 0332274d42..3b48073ec6 100644 --- a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm +++ b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm @@ -1734,8 +1734,8 @@ /area/shiva/interior/colony/medseceng) "ahP" = ( /obj/structure/surface/rack, -/obj/item/weapon/gun/revolver/cmb, -/obj/item/weapon/gun/revolver/cmb{ +/obj/item/weapon/gun/revolver/spearhead, +/obj/item/weapon/gun/revolver/spearhead{ pixel_x = 6; pixel_y = -4 }, @@ -1847,8 +1847,8 @@ /area/shiva/interior/aerodrome) "aim" = ( /obj/structure/surface/rack, -/obj/item/weapon/gun/revolver/cmb, -/obj/item/weapon/gun/revolver/cmb{ +/obj/item/weapon/gun/revolver/spearhead, +/obj/item/weapon/gun/revolver/spearhead{ pixel_x = 6; pixel_y = -4 }, @@ -2383,13 +2383,13 @@ dir = 8; pixel_y = -5 }, -/obj/item/ammo_magazine/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb{ +/obj/item/ammo_magazine/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead{ pixel_x = 6; pixel_y = -4 }, -/obj/item/ammo_magazine/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb{ +/obj/item/ammo_magazine/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead{ pixel_x = 6; pixel_y = -4 }, @@ -2831,8 +2831,8 @@ /area/shiva/interior/warehouse) "anP" = ( /obj/structure/surface/table/woodentable, -/obj/item/weapon/gun/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead, /turf/open/floor/wood, /area/shiva/interior/colony/medseceng) "anR" = ( @@ -17922,13 +17922,13 @@ /area/shiva/interior/colony/central) "nfg" = ( /obj/structure/surface/rack, -/obj/item/ammo_magazine/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb{ +/obj/item/ammo_magazine/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead{ pixel_x = 6; pixel_y = -4 }, -/obj/item/ammo_magazine/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb{ +/obj/item/ammo_magazine/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead{ pixel_x = 6; pixel_y = -4 }, @@ -20274,7 +20274,7 @@ }, /area/shiva/interior/colony/deck) "pME" = ( -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/ammo_magazine/revolver/spearhead, /turf/open/floor/shiva{ icon_state = "floor3" }, @@ -21558,7 +21558,7 @@ /area/shiva/interior/colony/s_admin) "reV" = ( /obj/structure/surface/table, -/obj/item/weapon/gun/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, /turf/open/floor/shiva{ dir = 8; icon_state = "purplefull" @@ -24239,7 +24239,7 @@ }, /area/shiva/interior/colony/research_hab) "uee" = ( -/obj/item/weapon/gun/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/cp_lz2) "ueu" = ( @@ -24540,7 +24540,7 @@ /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/junkyard/fortbiceps) "upp" = ( -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/ammo_magazine/revolver/spearhead, /turf/open/floor/shiva{ dir = 8; icon_state = "purplefull" diff --git a/maps/map_files/Kutjevo/Kutjevo.dmm b/maps/map_files/Kutjevo/Kutjevo.dmm index 558f1a637d..42a46a0d9e 100644 --- a/maps/map_files/Kutjevo/Kutjevo.dmm +++ b/maps/map_files/Kutjevo/Kutjevo.dmm @@ -1324,7 +1324,7 @@ /area/kutjevo/interior/oob) "bRa" = ( /obj/structure/surface/rack, -/obj/item/weapon/gun/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, /turf/open/floor/kutjevo/colors/orange/edge{ dir = 1 }, @@ -3197,7 +3197,7 @@ /turf/open/floor/kutjevo/plate, /area/kutjevo/interior/colony_central) "emn" = ( -/obj/item/weapon/gun/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/complex/botany) "emU" = ( @@ -5278,7 +5278,7 @@ /turf/closed/wall/kutjevo/rock, /area/kutjevo/interior/complex/botany) "hkY" = ( -/obj/item/weapon/gun/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, /turf/open/gm/river/desert/deep/covered, /area/kutjevo/interior/power/comms) "hmi" = ( @@ -6684,7 +6684,7 @@ /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_S_East) "jtu" = ( -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/ammo_magazine/revolver/spearhead, /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/power/comms) "jtJ" = ( @@ -7554,7 +7554,7 @@ /obj/structure/barricade/deployable{ dir = 1 }, -/obj/item/weapon/gun/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/Northwest_Flight_Control) "kIn" = ( @@ -11306,7 +11306,7 @@ /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/Northwest_Colony) "pKO" = ( -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/ammo_magazine/revolver/spearhead, /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/power/comms) "pKP" = ( @@ -12682,7 +12682,7 @@ }, /area/kutjevo/exterior/runoff_river) "rNG" = ( -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/ammo_magazine/revolver/spearhead, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/botany) "rOd" = ( @@ -13389,7 +13389,7 @@ /turf/open/auto_turf/sand/layer2, /area/kutjevo/interior/colony_N_East) "sOc" = ( -/obj/item/ammo_magazine/revolver/cmb{ +/obj/item/ammo_magazine/revolver/spearhead{ pixel_x = 6; pixel_y = -4 }, @@ -13649,7 +13649,7 @@ /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/complex/botany/east_tech) "tgl" = ( -/obj/item/weapon/gun/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/Northwest_Flight_Control) "tgO" = ( @@ -13659,7 +13659,7 @@ /area/kutjevo/interior/colony_S_East) "tgZ" = ( /obj/structure/surface/table/almayer, -/obj/item/weapon/gun/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, /turf/open/floor/kutjevo/colors/purple, /area/kutjevo/interior/construction) "tha" = ( @@ -13908,7 +13908,7 @@ /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/complex/botany/east_tech) "tyW" = ( -/obj/item/weapon/gun/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/botany) "tzJ" = ( @@ -13927,7 +13927,7 @@ /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/construction) "tBB" = ( -/obj/item/ammo_magazine/revolver/cmb{ +/obj/item/ammo_magazine/revolver/spearhead{ pixel_x = 7; pixel_y = 6 }, @@ -15048,15 +15048,15 @@ /area/kutjevo/interior/complex/botany) "vaG" = ( /obj/structure/surface/table/almayer, -/obj/item/ammo_magazine/revolver/cmb{ +/obj/item/ammo_magazine/revolver/spearhead{ pixel_x = 7; pixel_y = 6 }, -/obj/item/ammo_magazine/revolver/cmb{ +/obj/item/ammo_magazine/revolver/spearhead{ pixel_x = -7; pixel_y = -6 }, -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/ammo_magazine/revolver/spearhead, /turf/open/floor/kutjevo/colors/purple, /area/kutjevo/interior/construction) "vbl" = ( @@ -15959,7 +15959,7 @@ /turf/open/gm/river/desert/shallow, /area/kutjevo/interior/oob/dev_room) "wpY" = ( -/obj/item/ammo_magazine/revolver/cmb{ +/obj/item/ammo_magazine/revolver/spearhead{ pixel_x = 6; pixel_y = -4 }, @@ -16532,7 +16532,7 @@ /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/complex/botany/east) "xkE" = ( -/obj/item/ammo_magazine/revolver/cmb{ +/obj/item/ammo_magazine/revolver/spearhead{ pixel_x = 7; pixel_y = 6 }, diff --git a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm index a196e2f20c..05a0678e75 100644 --- a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm +++ b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm @@ -3504,7 +3504,7 @@ /area/lv522/indoors/a_block/security) "bSa" = ( /obj/effect/decal/cleanable/blood, -/obj/item/weapon/gun/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, @@ -3535,7 +3535,7 @@ }, /obj/effect/decal/cleanable/blood/gibs, /obj/effect/decal/cleanable/blood, -/obj/item/weapon/gun/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, /turf/open/floor/shiva{ icon_state = "radiator_tile2" }, @@ -4293,7 +4293,7 @@ /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/w_rockies) "ckT" = ( -/obj/item/weapon/gun/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 }, @@ -22618,8 +22618,8 @@ "jmd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/rack, -/obj/item/weapon/gun/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead, /turf/open/floor/prison{ icon_state = "darkredfull2" }, @@ -38788,7 +38788,7 @@ }, /area/lv522/landing_zone_1) "pni" = ( -/obj/item/weapon/gun/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, /turf/open/floor/prison, /area/lv522/indoors/a_block/kitchen/glass) "pnj" = ( @@ -43096,7 +43096,7 @@ }, /area/lv522/atmos/command_centre) "qPu" = ( -/obj/item/weapon/gun/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, /obj/item/clothing/head/soft/sec, /obj/structure/curtain/medical, /turf/open/floor/strata{ @@ -60392,8 +60392,8 @@ /area/lv522/indoors/c_block/mining) "xbj" = ( /obj/structure/surface/rack, -/obj/item/weapon/gun/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ icon_state = "darkredfull2" diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm index c9c82635d8..d512590d7d 100644 --- a/maps/map_files/LV624/LV624.dmm +++ b/maps/map_files/LV624/LV624.dmm @@ -8865,10 +8865,10 @@ dir = 4 }, /obj/structure/surface/table, -/obj/item/weapon/gun/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead, /turf/open/floor{ dir = 5; icon_state = "red" @@ -8880,10 +8880,10 @@ }, /obj/structure/surface/table, /obj/item/clothing/ears/earmuffs, -/obj/item/ammo_magazine/revolver/cmb, -/obj/item/weapon/gun/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/ammo_magazine/revolver/spearhead, +/obj/item/weapon/gun/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead, /turf/open/floor{ dir = 9; icon_state = "red" diff --git a/maps/map_files/LV624/armory/10.cheese.dmm b/maps/map_files/LV624/armory/10.cheese.dmm index 96b4ef5942..347e392787 100644 --- a/maps/map_files/LV624/armory/10.cheese.dmm +++ b/maps/map_files/LV624/armory/10.cheese.dmm @@ -159,10 +159,10 @@ dir = 4 }, /obj/structure/surface/table, -/obj/item/weapon/gun/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead, /turf/open/floor{ dir = 5; icon_state = "red" diff --git a/maps/map_files/LV624/armory/10.extra.dmm b/maps/map_files/LV624/armory/10.extra.dmm index cf1aaaa538..53a94ef204 100644 --- a/maps/map_files/LV624/armory/10.extra.dmm +++ b/maps/map_files/LV624/armory/10.extra.dmm @@ -164,10 +164,10 @@ dir = 4 }, /obj/structure/surface/table, -/obj/item/weapon/gun/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead, /turf/open/floor{ dir = 5; icon_state = "red" diff --git a/maps/map_files/LV624/armory/10.looted.dmm b/maps/map_files/LV624/armory/10.looted.dmm index cf2d4a9e02..ae5bbef21b 100644 --- a/maps/map_files/LV624/armory/10.looted.dmm +++ b/maps/map_files/LV624/armory/10.looted.dmm @@ -137,10 +137,10 @@ dir = 4 }, /obj/structure/surface/table, -/obj/item/weapon/gun/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead, /turf/open/floor{ dir = 5; icon_state = "red" diff --git a/maps/map_files/LV624_Fixed/LV624_repaired.dmm b/maps/map_files/LV624_Fixed/LV624_repaired.dmm index 0054709887..f023125c2d 100644 --- a/maps/map_files/LV624_Fixed/LV624_repaired.dmm +++ b/maps/map_files/LV624_Fixed/LV624_repaired.dmm @@ -17585,10 +17585,10 @@ dir = 4 }, /obj/structure/surface/table, -/obj/item/weapon/gun/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead, /turf/open/floor{ dir = 5; icon_state = "red" @@ -19048,10 +19048,10 @@ }, /obj/structure/surface/table, /obj/item/clothing/ears/earmuffs, -/obj/item/ammo_magazine/revolver/cmb, -/obj/item/weapon/gun/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/ammo_magazine/revolver/spearhead, +/obj/item/weapon/gun/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead, /turf/open/floor{ dir = 9; icon_state = "red" diff --git a/maps/map_files/New_Varadero/New_Varadero.dmm b/maps/map_files/New_Varadero/New_Varadero.dmm index 8269e4a458..0b29155026 100644 --- a/maps/map_files/New_Varadero/New_Varadero.dmm +++ b/maps/map_files/New_Varadero/New_Varadero.dmm @@ -1381,7 +1381,7 @@ dir = 1; pixel_y = 17 }, -/obj/item/weapon/gun/revolver/cmb{ +/obj/item/weapon/gun/revolver/spearhead{ pixel_y = 2 }, /obj/item/clothing/ears/earmuffs{ @@ -4748,7 +4748,7 @@ }, /area/varadero/interior/hall_NW) "dcM" = ( -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/ammo_magazine/revolver/spearhead, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/caves/north_research) "dda" = ( @@ -14358,7 +14358,7 @@ }, /area/varadero/interior/records) "jvF" = ( -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/ammo_magazine/revolver/spearhead, /turf/open/floor/shiva{ icon_state = "multi_tiles" }, @@ -14369,7 +14369,7 @@ /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) "jwy" = ( -/obj/item/weapon/gun/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, /turf/open/floor/shiva{ icon_state = "purple" }, @@ -24832,16 +24832,16 @@ /area/varadero/interior/hall_SE) "qfb" = ( /obj/structure/closet/crate/ammo/alt, -/obj/item/ammo_magazine/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb{ +/obj/item/ammo_magazine/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead{ pixel_x = -4; pixel_y = -5 }, -/obj/item/ammo_magazine/revolver/cmb{ +/obj/item/ammo_magazine/revolver/spearhead{ pixel_x = -4; pixel_y = -5 }, -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/ammo_magazine/revolver/spearhead, /turf/open/floor/shiva{ icon_state = "floor3" }, @@ -26627,7 +26627,7 @@ /obj/structure/machinery/light{ dir = 1 }, -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/ammo_magazine/revolver/spearhead, /turf/open/floor/shiva{ icon_state = "purple" }, @@ -37068,8 +37068,8 @@ /area/varadero/interior/electrical) "xRx" = ( /obj/structure/surface/table/woodentable, -/obj/item/weapon/gun/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead, /turf/open/floor/wood, /area/varadero/interior/security) "xRF" = ( diff --git a/maps/map_files/New_Varadero_Fixed/New_Varadero_Repaired.dmm b/maps/map_files/New_Varadero_Fixed/New_Varadero_Repaired.dmm index 5f5317054b..7a81776beb 100644 --- a/maps/map_files/New_Varadero_Fixed/New_Varadero_Repaired.dmm +++ b/maps/map_files/New_Varadero_Fixed/New_Varadero_Repaired.dmm @@ -1273,7 +1273,7 @@ dir = 1; pixel_y = 17 }, -/obj/item/weapon/gun/revolver/cmb{ +/obj/item/weapon/gun/revolver/spearhead{ pixel_y = 2 }, /obj/item/clothing/ears/earmuffs{ @@ -23255,16 +23255,16 @@ /area/varadero/interior/bunks) "qfb" = ( /obj/structure/closet/crate/ammo/alt, -/obj/item/ammo_magazine/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb{ +/obj/item/ammo_magazine/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead{ pixel_x = -4; pixel_y = -5 }, -/obj/item/ammo_magazine/revolver/cmb{ +/obj/item/ammo_magazine/revolver/spearhead{ pixel_x = -4; pixel_y = -5 }, -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/ammo_magazine/revolver/spearhead, /turf/open/floor/shiva{ icon_state = "floor3" }, @@ -34783,8 +34783,8 @@ /area/varadero/interior/electrical) "xRx" = ( /obj/structure/surface/table/woodentable, -/obj/item/weapon/gun/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead, /turf/open/floor/wood, /area/varadero/interior/security) "xRF" = ( diff --git a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm index 9cc753e4bd..451798f51f 100644 --- a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm +++ b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm @@ -2191,7 +2191,7 @@ /area/strata/ag/interior/dorms/hive) "agD" = ( /obj/effect/decal/cleanable/blood, -/obj/item/ammo_magazine/revolver/cmb{ +/obj/item/ammo_magazine/revolver/spearhead{ pixel_x = 6; pixel_y = -4 }, @@ -2238,7 +2238,7 @@ /area/strata/ag/exterior/paths/cabin_area) "agI" = ( /obj/structure/bed/nest, -/obj/item/weapon/gun/revolver/cmb{ +/obj/item/weapon/gun/revolver/spearhead{ pixel_x = 6; pixel_y = -4 }, @@ -2447,7 +2447,7 @@ /area/strata/ag/interior/dorms/hive) "aht" = ( /obj/structure/bed/nest, -/obj/item/ammo_magazine/revolver/cmb{ +/obj/item/ammo_magazine/revolver/spearhead{ pixel_x = 6; pixel_y = -4 }, @@ -2824,7 +2824,7 @@ /obj/effect/decal/cleanable/blood{ icon_state = "xgib2" }, -/obj/item/ammo_magazine/revolver/cmb{ +/obj/item/ammo_magazine/revolver/spearhead{ pixel_x = 6; pixel_y = -4 }, @@ -2834,7 +2834,7 @@ /area/strata/ag/interior/dorms/hive) "aiC" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/obj/item/ammo_magazine/revolver/cmb{ +/obj/item/ammo_magazine/revolver/spearhead{ pixel_x = 6; pixel_y = -4 }, @@ -3043,7 +3043,7 @@ }, /area/strata/ag/interior/dorms/hive) "ajk" = ( -/obj/item/weapon/gun/revolver/cmb{ +/obj/item/weapon/gun/revolver/spearhead{ pixel_x = 6; pixel_y = -4 }, @@ -27742,7 +27742,7 @@ }, /area/strata/ag/interior/nearlz1) "coY" = ( -/obj/item/ammo_magazine/revolver/cmb{ +/obj/item/ammo_magazine/revolver/spearhead{ pixel_x = 6; pixel_y = -4 }, @@ -27752,7 +27752,7 @@ /area/strata/ag/interior/dorms/hive) "coZ" = ( /obj/effect/decal/cleanable/blood, -/obj/item/ammo_magazine/revolver/cmb{ +/obj/item/ammo_magazine/revolver/spearhead{ pixel_x = 6; pixel_y = -4 }, @@ -33135,12 +33135,12 @@ /turf/closed/wall/strata_outpost, /area/strata/ug/interior/outpost/jung/dorms/med2) "jXD" = ( -/obj/item/weapon/gun/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, /obj/structure/surface/rack{ layer = 2.5 }, -/obj/item/ammo_magazine/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/ammo_magazine/revolver/spearhead, +/obj/item/ammo_magazine/revolver/spearhead, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/strata{ dir = 4; @@ -34361,7 +34361,7 @@ /obj/structure/pipes/vents/pump{ dir = 1 }, -/obj/item/ammo_magazine/revolver/cmb{ +/obj/item/ammo_magazine/revolver/spearhead{ pixel_x = 6; pixel_y = -4 }, @@ -36915,7 +36915,7 @@ /turf/open/floor/strata, /area/strata/ug/interior/outpost/jung/dorms/med2) "qdI" = ( -/obj/item/ammo_magazine/revolver/cmb, +/obj/item/ammo_magazine/revolver/spearhead, /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/paths/southresearch) "qer" = ( @@ -40802,7 +40802,7 @@ }, /area/strata/ag/interior/research_decks/security) "wgu" = ( -/obj/item/weapon/gun/revolver/cmb, +/obj/item/weapon/gun/revolver/spearhead, /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/paths/southresearch) "wgB" = (