From 0cf8d6a6498f1b775baa5b1bcec46d2ab6c5e269 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 15 Feb 2021 18:48:59 +0100 Subject: [PATCH] [MIRROR] Sprite fixes: Suppressed Sniper Rifles and Donksoft Pistols (#3403) * Sprite fixes: Suppressed Sniper Rifles and Donksoft Pistols (#56754) * Gives the sniper rifle a suppressor overlay so that it no longer shows up as missing a sprite, also fixes donksoft pistols by repathing them from pistols over repathing them from toy saber smgs. Creates a flag for checking if a gun needs a toy overlay, so it is handled in the parent. * Sprite fixes: Suppressed Sniper Rifles and Donksoft Pistols * Update maint_loot_common.dm Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com> Co-authored-by: Gandalf2k15 --- .../map_files/Deltastation/DeltaStation2.dmm | 2 +- code/__DEFINES/obj_flags.dm | 3 ++ code/game/objects/items/storage/holsters.dm | 3 -- code/modules/cargo/packs.dm | 4 +- code/modules/mining/abandoned_crates.dm | 2 +- code/modules/projectiles/gun.dm | 1 + code/modules/projectiles/guns/ballistic.dm | 5 ++- .../projectiles/guns/ballistic/automatic.dm | 2 + .../modules/projectiles/guns/ballistic/toy.dm | 39 ++++-------------- code/modules/uplink/uplink_items.dm | 2 +- code/modules/vending/liberation_toy.dm | 2 +- code/modules/vending/toys.dm | 2 +- icons/obj/guns/projectile.dmi | Bin 31893 -> 32357 bytes .../code/_globalvars/maint_loot_common.dm | 2 +- 14 files changed, 26 insertions(+), 43 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 1080f868a45..2e99af52c3f 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -5841,7 +5841,7 @@ /area/maintenance/starboard/fore) "asc" = ( /obj/structure/table/wood, -/obj/item/gun/ballistic/automatic/toy/pistol/unrestricted, +/obj/item/gun/ballistic/automatic/pistol/toy, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, diff --git a/code/__DEFINES/obj_flags.dm b/code/__DEFINES/obj_flags.dm index 68661c316ad..dfb5fd7733f 100644 --- a/code/__DEFINES/obj_flags.dm +++ b/code/__DEFINES/obj_flags.dm @@ -73,6 +73,9 @@ /// Flags for the pod_flags var on /obj/structure/closet/supplypod #define FIRST_SOUNDS (1<<0) // If it shouldn't play sounds the first time it lands, used for reverse mode +/// Flags for the gun_flags var for firearms +#define TOY_FIREARM_OVERLAY (1<<0) // If update_overlay would add some indicator that the gun is a toy, like a plastic cap on a pistol + /// Flags for sharpness in obj/item #define SHARP_EDGED (1<<0) #define SHARP_POINTY (1<<1) diff --git a/code/game/objects/items/storage/holsters.dm b/code/game/objects/items/storage/holsters.dm index 5a347dada27..5a359870baa 100644 --- a/code/game/objects/items/storage/holsters.dm +++ b/code/game/objects/items/storage/holsters.dm @@ -24,7 +24,6 @@ STR.set_holdable(list( /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver, - /obj/item/gun/ballistic/automatic/toy/pistol, /obj/item/gun/energy/e_gun/mini, /obj/item/gun/energy/disabler, /obj/item/gun/energy/dueling @@ -49,7 +48,6 @@ /obj/item/ammo_box/c38, // Revolver speedloaders. /obj/item/ammo_box/a357, /obj/item/ammo_box/a762, - /obj/item/gun/ballistic/automatic/toy/pistol, /obj/item/ammo_box/magazine/toy/pistol, /obj/item/gun/energy/e_gun/mini, /obj/item/gun/energy/disabler, @@ -108,7 +106,6 @@ /obj/item/ammo_box/c38, /obj/item/ammo_box/a357, /obj/item/ammo_box/a762, - /obj/item/gun/ballistic/automatic/toy/pistol, /obj/item/ammo_box/magazine/toy/pistol, /obj/item/gun/energy/kinetic_accelerator/crossbow, /obj/item/gun/energy/e_gun/mini, diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index ce5d8bd614c..9591e40f385 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -2192,8 +2192,8 @@ desc = "Psst.. hey bud... remember those old foam force pistols that got discontinued for being too cool? Well I got two of those right here with your name on em. I'll even throw in a spare mag for each, waddya say?" contraband = TRUE cost = CARGO_CRATE_VALUE * 8 - contains = list(/obj/item/gun/ballistic/automatic/toy/pistol, - /obj/item/gun/ballistic/automatic/toy/pistol, + contains = list(/obj/item/gun/ballistic/automatic/pistol/toy, + /obj/item/gun/ballistic/automatic/pistol/toy, /obj/item/ammo_box/magazine/toy/pistol, /obj/item/ammo_box/magazine/toy/pistol) crate_name = "foam force crate" diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm index f86bce4268c..50c1add0b57 100644 --- a/code/modules/mining/abandoned_crates.dm +++ b/code/modules/mining/abandoned_crates.dm @@ -221,7 +221,7 @@ for(var/i in 1 to 4) new /obj/item/clothing/mask/balaclava(src) new /obj/item/gun/ballistic/shotgun/toy(src) - new /obj/item/gun/ballistic/automatic/toy/pistol/unrestricted(src) + new /obj/item/gun/ballistic/automatic/pistol/toy(src) new /obj/item/gun/ballistic/automatic/toy/unrestricted(src) new /obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted(src) new /obj/item/ammo_box/foambox(src) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 109898f1538..f9f95f3cfa2 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -21,6 +21,7 @@ attack_verb_continuous = list("strikes", "hits", "bashes") attack_verb_simple = list("strike", "hit", "bash") + var/gun_flags = NONE var/fire_sound = 'sound/weapons/gun/pistol/shot.ogg' var/vary_fire_sound = TRUE var/fire_sound_volume = 50 diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index a7fe375dc2d..960420e1ea1 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -153,6 +153,10 @@ . += MA if(!chambered && empty_indicator) //this is duplicated in c20's update_overlayss due to a layering issue with the select fire icon. . += "[icon_state]_empty" + + if(gun_flags & TOY_FIREARM_OVERLAY) + . += "[icon_state]_toy" + if (magazine && !internal_magazine) if (special_mags) . += "[icon_state]_mag_[initial(magazine.icon_state)]" @@ -177,7 +181,6 @@ if (capacity_number) . += "[icon_state]_mag_[capacity_number]" - /obj/item/gun/ballistic/process_chamber(empty_chamber = TRUE, from_firing = TRUE, chamber_next_round = TRUE) if(!semi_auto && from_firing) return diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index 04d816f8e68..93385667470 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -340,6 +340,8 @@ slot_flags = ITEM_SLOT_BACK actions_types = list() mag_display = TRUE + suppressor_x_offset = 3 + suppressor_y_offset = 3 /obj/item/gun/ballistic/automatic/sniper_rifle/syndicate name = "syndicate sniper rifle" diff --git a/code/modules/projectiles/guns/ballistic/toy.dm b/code/modules/projectiles/guns/ballistic/toy.dm index ffdad6d584c..dcf96f1687b 100644 --- a/code/modules/projectiles/guns/ballistic/toy.dm +++ b/code/modules/projectiles/guns/ballistic/toy.dm @@ -12,40 +12,26 @@ can_suppress = TRUE clumsy_check = FALSE item_flags = NONE + gun_flags = TOY_FIREARM_OVERLAY casing_ejector = FALSE -/obj/item/gun/ballistic/automatic/toy/update_overlays() - . = ..() - . += "[icon_state]_toy" - /obj/item/gun/ballistic/automatic/toy/unrestricted pin = /obj/item/firing_pin -/obj/item/gun/ballistic/automatic/toy/pistol +/obj/item/gun/ballistic/automatic/pistol/toy name = "foam force pistol" desc = "A small, easily concealable toy handgun. Ages 8 and up." - icon_state = "pistol" - bolt_type = BOLT_TYPE_LOCKING - w_class = WEIGHT_CLASS_SMALL mag_type = /obj/item/ammo_box/magazine/toy/pistol fire_sound = 'sound/items/syringeproj.ogg' - burst_size = 1 - fire_delay = 0 - actions_types = list() + gun_flags = TOY_FIREARM_OVERLAY -/obj/item/gun/ballistic/automatic/toy/pistol/riot +/obj/item/gun/ballistic/automatic/pistol/toy/riot mag_type = /obj/item/ammo_box/magazine/toy/pistol/riot -/obj/item/gun/ballistic/automatic/toy/pistol/riot/Initialize() +/obj/item/gun/ballistic/automatic/pistol/riot/Initialize() magazine = new /obj/item/ammo_box/magazine/toy/pistol/riot(src) return ..() -/obj/item/gun/ballistic/automatic/toy/pistol/unrestricted - pin = /obj/item/firing_pin - -/obj/item/gun/ballistic/automatic/toy/pistol/riot/unrestricted - pin = /obj/item/firing_pin - /obj/item/gun/ballistic/shotgun/toy name = "foam force shotgun" desc = "A toy shotgun with wood furniture and a four-shell capacity underneath. Ages 8 and up." @@ -58,10 +44,7 @@ casing_ejector = FALSE can_suppress = FALSE pb_knockback = 0 - -/obj/item/gun/ballistic/shotgun/toy/update_overlays() - . = ..() - . += "[icon_state]_toy" + gun_flags = TOY_FIREARM_OVERLAY /obj/item/gun/ballistic/shotgun/toy/process_chamber(empty_chamber = 0) ..() @@ -92,6 +75,7 @@ mag_type = /obj/item/ammo_box/magazine/toy/smgm45/riot casing_ejector = FALSE clumsy_check = FALSE + gun_flags = TOY_FIREARM_OVERLAY /obj/item/gun/ballistic/automatic/c20r/toy/unrestricted //Use this for actual toys pin = /obj/item/firing_pin @@ -100,10 +84,6 @@ /obj/item/gun/ballistic/automatic/c20r/toy/unrestricted/riot mag_type = /obj/item/ammo_box/magazine/toy/smgm45/riot -/obj/item/gun/ballistic/automatic/c20r/toy/update_overlays() - . = ..() - . += "[icon_state]_toy" - /obj/item/gun/ballistic/automatic/l6_saw/toy //This is the syndicate variant with syndicate firing pin and riot darts. name = "donksoft LMG" desc = "A heavily modified toy light machine gun, designated 'L6 SAW'. Ages 8 and up." @@ -113,6 +93,7 @@ mag_type = /obj/item/ammo_box/magazine/toy/m762/riot casing_ejector = FALSE clumsy_check = FALSE + gun_flags = TOY_FIREARM_OVERLAY /obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted //Use this for actual toys pin = /obj/item/firing_pin @@ -120,7 +101,3 @@ /obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted/riot mag_type = /obj/item/ammo_box/magazine/toy/m762/riot - -/obj/item/gun/ballistic/automatic/l6_saw/toy/update_overlays() - . = ..() - . += "[icon_state]_toy" diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index 1d6792dc5b7..0853001e651 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -550,7 +550,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) name = "Toy Pistol with Riot Darts" desc = "An innocent-looking toy pistol designed to fire foam darts. Comes loaded with riot-grade \ darts effective at incapacitating a target." - item = /obj/item/gun/ballistic/automatic/toy/pistol/riot + item = /obj/item/gun/ballistic/automatic/pistol/toy/riot cost = 2 surplus = 10 diff --git a/code/modules/vending/liberation_toy.dm b/code/modules/vending/liberation_toy.dm index 8e1e5f674ae..d5c247c0a25 100644 --- a/code/modules/vending/liberation_toy.dm +++ b/code/modules/vending/liberation_toy.dm @@ -7,7 +7,7 @@ vend_reply = "Come back for more!" circuit = /obj/item/circuitboard/machine/vending/syndicatedonksofttoyvendor products = list(/obj/item/gun/ballistic/automatic/toy/unrestricted = 10, - /obj/item/gun/ballistic/automatic/toy/pistol/unrestricted = 10, + /obj/item/gun/ballistic/automatic/pistol/toy = 10, /obj/item/gun/ballistic/shotgun/toy/unrestricted = 10, /obj/item/toy/sword = 10, /obj/item/ammo_box/foambox = 20, diff --git a/code/modules/vending/toys.dm b/code/modules/vending/toys.dm index 94d2c12e4cf..fa55857fb78 100644 --- a/code/modules/vending/toys.dm +++ b/code/modules/vending/toys.dm @@ -9,7 +9,7 @@ circuit = /obj/item/circuitboard/machine/vending/donksofttoyvendor products = list( /obj/item/gun/ballistic/automatic/toy/unrestricted = 10, - /obj/item/gun/ballistic/automatic/toy/pistol/unrestricted = 10, + /obj/item/gun/ballistic/automatic/pistol/toy = 10, /obj/item/gun/ballistic/shotgun/toy/unrestricted = 10, /obj/item/toy/sword = 10, /obj/item/ammo_box/foambox = 20, diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi index 1c9c69ae5356f18409a5672fdcb39c7132c9b8cd..fdd0d047f608e494a0990c7e8879e36e4592ce5b 100644 GIT binary patch delta 12733 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 C>qCD4 delta 12265 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 diff --git a/modular_skyrat/master_files/code/_globalvars/maint_loot_common.dm b/modular_skyrat/master_files/code/_globalvars/maint_loot_common.dm index bae629322bb..875a919e541 100644 --- a/modular_skyrat/master_files/code/_globalvars/maint_loot_common.dm +++ b/modular_skyrat/master_files/code/_globalvars/maint_loot_common.dm @@ -208,7 +208,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items /obj/item/gun/ballistic/automatic/c20r/toy/unrestricted = 25, /obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted = 25, /obj/item/gun/ballistic/automatic/toy/unrestricted = 25, - /obj/item/gun/ballistic/automatic/toy/pistol/unrestricted = 25, + /obj/item/gun/ballistic/automatic/pistol/toy = 25, /obj/item/gun/ballistic/shotgun/toy/unrestricted = 25, /obj/item/gun/ballistic/shotgun/toy/crossbow = 25, /obj/item/hot_potato/harmless/toy = 25,