From d93089cf5203805e79553e68aa1d9cd7aa74cad3 Mon Sep 17 00:00:00 2001 From: chafla Date: Wed, 11 Aug 2021 18:18:30 -0700 Subject: [PATCH 1/5] Make foam pistols able to be holstered --- code/modules/projectiles/guns/projectile/toy.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/projectiles/guns/projectile/toy.dm b/code/modules/projectiles/guns/projectile/toy.dm index 55a9aa79c6b..dae049d762e 100644 --- a/code/modules/projectiles/guns/projectile/toy.dm +++ b/code/modules/projectiles/guns/projectile/toy.dm @@ -26,6 +26,7 @@ can_suppress = 0 burst_size = 1 fire_delay = 0 + can_holster = TRUE actions_types = list() /obj/item/gun/projectile/automatic/toy/pistol/update_icon() From 138f71b2868885a76221f76edbfa26dd802549bd Mon Sep 17 00:00:00 2001 From: chafla Date: Wed, 11 Aug 2021 18:19:57 -0700 Subject: [PATCH 2/5] Fix typo in enforcer desc while we're at it --- code/modules/projectiles/guns/projectile/toy.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/projectile/toy.dm b/code/modules/projectiles/guns/projectile/toy.dm index dae049d762e..fabab7b754f 100644 --- a/code/modules/projectiles/guns/projectile/toy.dm +++ b/code/modules/projectiles/guns/projectile/toy.dm @@ -44,7 +44,7 @@ /obj/item/gun/projectile/automatic/toy/pistol/enforcer name = "Foam Enforcer" - desc = "A foam shooting version of the Enforcer meant to be used for training new caddets who can't be trusted with rubber bullets." + desc = "A foam-shooting version of the Enforcer meant to be used for training new cadets who can't be trusted with rubber bullets." icon_state = "enforcer" mag_type = /obj/item/ammo_box/magazine/toy/enforcer can_flashlight = TRUE From 3876f5b8fc93bac48ead16a878b4bf43f9cb4ef4 Mon Sep 17 00:00:00 2001 From: chafla Date: Thu, 12 Aug 2021 13:47:14 -0700 Subject: [PATCH 3/5] Ensure revolvers are holsterable, with exceptions Makes base revolver datum holsterable Excludes grenade launchers, advanced mimery --- code/modules/projectiles/guns/energy/stun.dm | 1 + code/modules/projectiles/guns/projectile/launchers.dm | 1 + code/modules/projectiles/guns/projectile/revolver.dm | 2 ++ 3 files changed, 4 insertions(+) diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index 2247a1a6c9c..b2f551e9927 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -16,6 +16,7 @@ ammo_type = list(/obj/item/ammo_casing/energy/shock_revolver) can_flashlight = 0 shaded_charge = FALSE + can_holster = TRUE // Pistol size /obj/item/gun/energy/gun/advtaser name = "hybrid taser" diff --git a/code/modules/projectiles/guns/projectile/launchers.dm b/code/modules/projectiles/guns/projectile/launchers.dm index 8256c8c7a50..37ba272a67e 100644 --- a/code/modules/projectiles/guns/projectile/launchers.dm +++ b/code/modules/projectiles/guns/projectile/launchers.dm @@ -9,6 +9,7 @@ mag_type = /obj/item/ammo_box/magazine/internal/grenadelauncher fire_sound = 'sound/weapons/grenadelaunch.ogg' w_class = WEIGHT_CLASS_NORMAL + can_holster = FALSE // Not your normal revolver /obj/item/gun/projectile/revolver/grenadelauncher/attackby(obj/item/A, mob/user, params) ..() diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index aa365767223..1b9dcc15079 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -5,6 +5,7 @@ mag_type = /obj/item/ammo_box/magazine/internal/cylinder origin_tech = "combat=3;materials=2" fire_sound = 'sound/weapons/gunshots/gunshot_strong.ogg' + can_holster = TRUE /obj/item/gun/projectile/revolver/New() ..() @@ -158,6 +159,7 @@ fire_sound_text = null lefthand_file = null righthand_file = null + can_holster = FALSE // Get your fingers out of there! trigger_guard = TRIGGER_GUARD_ALLOW_ALL clumsy_check = 0 //Stole your uplink! Honk! needs_permit = 0 //go away beepsky From 0f0a18c6c7e38d060f408e842419099931df24b9 Mon Sep 17 00:00:00 2001 From: chafla Date: Thu, 12 Aug 2021 14:42:36 -0700 Subject: [PATCH 4/5] Set holster default to false --- code/game/gamemodes/miniantags/abduction/abduction_gear.dm | 1 + code/modules/projectiles/gun.dm | 2 +- code/modules/projectiles/guns/energy/nuclear.dm | 3 +++ code/modules/projectiles/guns/energy/special.dm | 7 +++++++ code/modules/projectiles/guns/energy/stun.dm | 6 +++++- code/modules/projectiles/guns/magic.dm | 1 + code/modules/projectiles/guns/projectile/automatic.dm | 2 +- 7 files changed, 19 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index a0519fcbe56..08dbec69279 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -358,6 +358,7 @@ item_state = "alienpistol" origin_tech = "combat=4;magnets=7;powerstorage=3;abductor=3" trigger_guard = TRIGGER_GUARD_ALLOW_ALL + can_holster = TRUE /obj/item/paper/abductor name = "Dissection Guide" diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index dedba26bb68..61f421c07da 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -56,7 +56,7 @@ var/knife_x_offset = 0 var/knife_y_offset = 0 - var/can_holster = TRUE + var/can_holster = FALSE // Anything that can be holstered should be manually set var/list/upgrades = list() diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index a39e018909a..45fa6a4dcf2 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -31,6 +31,7 @@ can_flashlight = 0 // Can't attach or detach the flashlight, and override it's icon update actions_types = list(/datum/action/item_action/toggle_gunlight) shaded_charge = FALSE + can_holster = TRUE // Pistol sized, so it should fit into a holster /obj/item/gun/energy/gun/mini/Initialize(mapload, ...) gun_light = new /obj/item/flashlight/seclite(src) @@ -53,6 +54,7 @@ ammo_x_offset = 4 resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF shaded_charge = FALSE + can_holster = TRUE /obj/item/gun/energy/gun/blueshield name = "advanced stun revolver" @@ -63,6 +65,7 @@ ammo_type = list(/obj/item/ammo_casing/energy/electrode/hos, /obj/item/ammo_casing/energy/laser/hos) ammo_x_offset = 1 shaded_charge = TRUE + can_holster = TRUE /obj/item/gun/energy/gun/blueshield/pdw9 name = "PDW-9 taser pistol" diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 09458fd8ba7..c1d496cbba9 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -37,6 +37,7 @@ origin_tech = "combat=4;materials=4;biotech=5;plasmatech=6" ammo_type = list(/obj/item/ammo_casing/energy/declone) ammo_x_offset = 1 + can_holster = TRUE /obj/item/gun/energy/decloner/update_icon() ..() @@ -56,6 +57,7 @@ modifystate = 1 ammo_x_offset = 1 selfcharge = 1 + can_holster = TRUE // Meteor Gun // /obj/item/gun/energy/meteorgun @@ -109,6 +111,7 @@ can_flashlight = 0 max_mod_capacity = 0 empty_state = null + can_holster = TRUE /obj/item/gun/energy/kinetic_accelerator/crossbow/large name = "energy crossbow" @@ -151,6 +154,7 @@ force = 12 sharp = 1 can_charge = 0 + can_holster = TRUE /obj/item/gun/energy/plasmacutter/examine(mob/user) . = ..() @@ -289,6 +293,7 @@ clumsy_check = 0 selfcharge = 1 ammo_x_offset = 3 + can_holster = TRUE // you'll never see it coming /obj/item/gun/energy/toxgun name = "plasma pistol" @@ -300,6 +305,7 @@ origin_tech = "combat=4;magnets=4;powerstorage=3" ammo_type = list(/obj/item/ammo_casing/energy/toxplasma) shaded_charge = 1 + can_holster = TRUE // Energy Sniper // /obj/item/gun/energy/sniperrifle @@ -624,6 +630,7 @@ selfcharge = 1 ammo_x_offset = 3 var/mimic_type = /obj/item/gun/projectile/automatic/pistol //Setting this to the mimicgun type does exactly what you think it will. + can_holster = TRUE /obj/item/gun/energy/mimicgun/newshot() var/obj/item/ammo_casing/energy/mimic/M = ammo_type[select] diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index b2f551e9927..7923bd77989 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -6,6 +6,7 @@ origin_tech = "combat=3" ammo_type = list(/obj/item/ammo_casing/energy/electrode) ammo_x_offset = 3 + can_holster = TRUE // Pistol size /obj/item/gun/energy/shock_revolver name = "tesla revolver" @@ -16,7 +17,8 @@ ammo_type = list(/obj/item/ammo_casing/energy/shock_revolver) can_flashlight = 0 shaded_charge = FALSE - can_holster = TRUE // Pistol size + can_holster = TRUE + /obj/item/gun/energy/gun/advtaser name = "hybrid taser" @@ -27,6 +29,7 @@ ammo_x_offset = 2 flight_x_offset = 15 shaded_charge = FALSE + can_holster = TRUE // Pistol size /obj/item/gun/energy/gun/advtaser/cyborg name = "cyborg taser" @@ -46,6 +49,7 @@ origin_tech = "combat=3" ammo_type = list(/obj/item/ammo_casing/energy/disabler) ammo_x_offset = 3 + can_holster = TRUE /obj/item/gun/energy/disabler/cyborg name = "cyborg disabler" diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm index 05a0134ded6..b03bd121615 100644 --- a/code/modules/projectiles/guns/magic.dm +++ b/code/modules/projectiles/guns/magic.dm @@ -18,6 +18,7 @@ origin_tech = null clumsy_check = 0 trigger_guard = TRIGGER_GUARD_ALLOW_ALL // Has no trigger at all, uses magic instead + can_holster = FALSE // Nothing here is a gun, and therefore shouldn't really fit into a holster lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' //not really a gun and some toys use these inhands righthand_file = 'icons/mob/inhands/items_righthand.dmi' diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 338cd24c6fe..53b8392c183 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -4,7 +4,6 @@ var/select = 1 can_tactical = TRUE can_suppress = 1 - can_holster = FALSE burst_size = 3 fire_delay = 2 actions_types = list(/datum/action/item_action/toggle_firemode) @@ -143,6 +142,7 @@ mag_type = /obj/item/ammo_box/magazine/uzim9mm fire_sound = 'sound/weapons/gunshots/gunshot_pistol.ogg' burst_size = 2 + can_holster = TRUE // it's a mini-uzi after all //M-90gl Carbine// /obj/item/gun/projectile/automatic/m90 From 578eda4fae845292da17cd5c6ba0555afe707cb1 Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 13 Aug 2021 10:54:36 -0700 Subject: [PATCH 5/5] Update code/modules/projectiles/guns/projectile/toy.dm Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com> --- code/modules/projectiles/guns/projectile/toy.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/projectile/toy.dm b/code/modules/projectiles/guns/projectile/toy.dm index fabab7b754f..5250ae70c81 100644 --- a/code/modules/projectiles/guns/projectile/toy.dm +++ b/code/modules/projectiles/guns/projectile/toy.dm @@ -43,7 +43,7 @@ ..() /obj/item/gun/projectile/automatic/toy/pistol/enforcer - name = "Foam Enforcer" + name = "foam Enforcer" desc = "A foam-shooting version of the Enforcer meant to be used for training new cadets who can't be trusted with rubber bullets." icon_state = "enforcer" mag_type = /obj/item/ammo_box/magazine/toy/enforcer