From ba78ea10a35abf1c48ae7392e4de1332c5b61c97 Mon Sep 17 00:00:00 2001 From: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com> Date: Sat, 23 Sep 2023 02:59:10 -0400 Subject: [PATCH] Prop gun effect (#4450) # About the pull request Adds an effect for a prop gun, where you enter the type path as its variable and it automatically makes it look like the gun but unusable (Codersprites should only be visible in mapping) # Explain why it's good for the game Makes it easier to map in destroyed or non-functional guns # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: add: Added a mapping effect for prop guns /:cl: --- .../effects/spawners/prop_gun_spawner.dm | 91 ++++++++++++++++++ code/modules/clothing/suits/marine_armor.dm | 3 +- colonialmarines.dme | 1 + icons/landmarks.dmi | Bin 36451 -> 36857 bytes maps/map_files/USS_Almayer/USS_Almayer.dmm | 7 +- 5 files changed, 95 insertions(+), 7 deletions(-) create mode 100644 code/game/objects/effects/spawners/prop_gun_spawner.dm diff --git a/code/game/objects/effects/spawners/prop_gun_spawner.dm b/code/game/objects/effects/spawners/prop_gun_spawner.dm new file mode 100644 index 000000000000..b04f6cffffe1 --- /dev/null +++ b/code/game/objects/effects/spawners/prop_gun_spawner.dm @@ -0,0 +1,91 @@ +/obj/effect/spawner/prop_gun //Makes a prop that looks similar to the original gun, for use such as broken guns + name = "prop gun spawner" + icon = 'icons/landmarks.dmi' + icon_state = "prop_gun" + ///The typepath of the gun the prop will copy + var/obj/item/weapon/gun/prop_gun_type = /obj/item/weapon/gun + ///if the prop will have a custom name + var/custom_gun_name + ///if the prob will have a custom desc + var/custom_gun_desc + ///The probability of the prop gun spawning + var/spawn_prob = 100 + +/obj/effect/spawner/prop_gun/Initialize(mapload, ...) + . = ..() + if(!ispath(prop_gun_type, /obj/item/weapon/gun)) + stack_trace("[src] using incorrect typepath, \"[prop_gun_type]\".") //Can't make a prop gun of something not a gun + qdel(src) + return + if(!spawn_prob) + qdel(src) + return + if(!mapload) + prepare_gun_skin() + return + return INITIALIZE_HINT_ROUNDSTART + +/obj/effect/spawner/prop_gun/LateInitialize() + prepare_gun_skin() + +///Spawns the items and modifies source to set skin on prop +/obj/effect/spawner/prop_gun/proc/prepare_gun_skin() + ///The source, which the skin will be copied from + var/obj/item/weapon/gun/source_gun = new prop_gun_type(src) + if(custom_gun_name) + source_gun.name = custom_gun_name + if(custom_gun_desc) + source_gun.desc = custom_gun_desc + source_gun.pixel_x = pixel_x + source_gun.pixel_y = pixel_y + source_gun.layer = layer + + ///The prop itself, which the skin will be copied to + var/obj/item/prop/prop_gun/prop_gun = new /obj/item/prop/prop_gun(loc) + prop_gun.set_gun_skin(source_gun) + qdel(src) + +/obj/item/prop/prop_gun + name = "prop gun" + desc = "A non-functional gun prop. You should not be able to see this." + icon = 'icons/landmarks.dmi' + icon_state = "prop_gun" + flags_item = TWOHANDED + pickup_sound = "gunequip" + drop_sound = "gunrustle" + pickupvol = 7 + dropvol = 15 + +///Makes the gun look similar to the source, using the source as an atom reference +/obj/item/prop/prop_gun/proc/set_gun_skin(obj/item/weapon/gun/source_gun) + if(!source_gun) + return + name = source_gun.name + desc = source_gun.desc + icon = source_gun.icon + item_icons = source_gun.item_icons + icon_state = source_gun.icon_state + item_state = source_gun.item_state + w_class = source_gun.w_class + flags_equip_slot = source_gun.flags_equip_slot + pixel_x = source_gun.pixel_x + pixel_y = source_gun.pixel_y + layer = source_gun.layer + +/obj/item/prop/prop_gun/attack_self(mob/user) //Mimic wielding of real guns + . = ..() + if(!(flags_item & TWOHANDED)) + return + if(flags_item & WIELDED) + unwield(user) + else + wield(user) + +/obj/item/prop/prop_gun/dropped(mob/user) + ..() + unwield(user) + +/obj/effect/spawner/prop_gun/m41aMK1 + prop_gun_type = /obj/item/weapon/gun/rifle/m41aMK1 + custom_gun_name = "\improper Broken M41A pulse rifle" + custom_gun_desc = "An older design of the Pulse Rifle commonly used by Colonial Marines. This one has seen better days. The trigger is missing, the barrel is bent, and it no longer appropriately feeds magazines." diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm index df7a8bc65b19..e2a0ce4ccf07 100644 --- a/code/modules/clothing/suits/marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor.dm @@ -60,7 +60,8 @@ siemens_coefficient = 0.7 slowdown = SLOWDOWN_ARMOR_MEDIUM allowed = list( - /obj/item/weapon/gun/, + /obj/item/weapon/gun, + /obj/item/prop/prop_gun, /obj/item/tank/emergency_oxygen, /obj/item/device/flashlight, /obj/item/storage/fancy/cigarettes, diff --git a/colonialmarines.dme b/colonialmarines.dme index be4f5743de74..07d6a2710262 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -970,6 +970,7 @@ s// DM Environment file for colonialmarines.dme. #include "code\game\objects\effects\landmarks\structure_spawners\structure_spawner.dm" #include "code\game\objects\effects\landmarks\structure_spawners\xvx_hive.dm" #include "code\game\objects\effects\spawners\gibspawner.dm" +#include "code\game\objects\effects\spawners\prop_gun_spawner.dm" #include "code\game\objects\effects\spawners\random.dm" #include "code\game\objects\effects\spawners\spawner.dm" #include "code\game\objects\effects\spawners\vaultspawner.dm" diff --git a/icons/landmarks.dmi b/icons/landmarks.dmi index 8898783f74c22bad599c970bd6f1fd652f7b6f31..8ebeaef1648b76d79f7f029055305f306518c3bb 100644 GIT binary patch delta 9837 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 SJlg%8b((6rsujx5LjMnvXSbFB delta 9403 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 diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 2bd769e3a3c1..36fd4cb7f2a2 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -69822,12 +69822,7 @@ pixel_y = 2 }, /obj/structure/largecrate/random/case, -/obj/item/prop{ - desc = "An older design of the Pulse Rifle commonly used by Colonial Marines. This one has seen better days. The trigger is missing, the barrel is bent, and it no longer appropriately feeds magazines."; - icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi'; - icon_state = "m41amk1_e"; - item_state = "m41amk1"; - name = "\improper Broken M41A pulse rifle"; +/obj/effect/spawner/prop_gun/m41aMK1{ pixel_y = 7 }, /obj/item/prop/helmetgarb/gunoil{