From a89e9f20aa1950e5b0014bf332fc8b3939c10f8d Mon Sep 17 00:00:00 2001 From: Zna12 Date: Mon, 5 Feb 2018 01:23:46 -0600 Subject: [PATCH] Foam-Force Assault Machines. (#5243) * REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE i HAVE NO IDEA WHAT I'M DOING * Wew. Managed to add the AM4 to the thingy. WYSIWYG * ALMOST DONEEEE Wew. Just a few more tweaks * To be reverted. This is just adding a file of the sprite for the mag so I can work at work * AM4B Complete, Moving to AM4C And also I need to make the magazines. * One step forward two steps back. Magazine sprites are in. still need to test it. * Forgot to save a file. Woops. * AM4 Finished. Adds two weapons, the AM4-B and the AM4-C. Yes they're supposed to look like the MA5. * Reverted those last couple things. Deleted some loose files that I didn't actually need. Whoops. --- code/citadel/cit_guns.dm | 83 ++++++++++++++++++ icons/obj/guns/cit_guns.dmi | Bin 42315 -> 44211 bytes .../code/modules/client/loadout/_donator.dm | 6 ++ 3 files changed, 89 insertions(+) diff --git a/code/citadel/cit_guns.dm b/code/citadel/cit_guns.dm index c5338fe9d3..97fe70d112 100644 --- a/code/citadel/cit_guns.dm +++ b/code/citadel/cit_guns.dm @@ -1216,3 +1216,86 @@ obj/item/gun/energy/e_gun/cx/worn_overlays(isinhands, icon_file) /obj/item/ammo_box/magazine/toy/pistol //forcing this might be a bad idea, but it'll fix the foam gun infinite material exploit materials = list(MAT_METAL = 200) + +/*///////////////////////////////////////////////////////////// +//////////////////////// Zero's Meme ////////////////////////// +*////////////////////////////////////////////////////////////// +/obj/item/ammo_box/magazine/toy/AM4B + name = "foam force AM4-B magazine" + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "AM4MAG-60" + max_ammo = 60 + multiple_sprites = 0 + materials = list(MAT_METAL = 200) + +/obj/item/gun/ballistic/automatic/AM4B + name = "AM4-B" + desc = "A Relic from a bygone age. Nobody quite knows why it's here. Has a polychromic coating." + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "AM4" + item_state = "arg" + mag_type = /obj/item/ammo_box/magazine/toy/AM4B + can_suppress = 0 + needs_permit = 0 + casing_ejector = 0 + spread = 30 //Assault Rifleeeeeee + w_class = WEIGHT_CLASS_NORMAL + burst_size = 4 //Shh. + fire_delay = 1 + var/body_color = "#3333aa" + +/obj/item/gun/ballistic/automatic/AM4B/update_icon() + ..() + var/mutable_appearance/body_overlay = mutable_appearance('icons/obj/guns/cit_guns.dmi', "AM4-Body") + if(body_color) + body_overlay.color = body_color + cut_overlays() //So that it doesn't keep stacking overlays non-stop on top of each other + add_overlay(body_overlay) + if(ismob(loc)) + var/mob/M = loc + M.update_inv_hands() +/obj/item/gun/ballistic/automatic/AM4B/AltClick(mob/living/user) + if(!in_range(src, user)) //Basic checks to prevent abuse + return + if(user.incapacitated() || !istype(user)) + to_chat(user, "You can't do that right now!") + return + if(alert("Are you sure you want to recolor your gun?", "Confirm Repaint", "Yes", "No") == "Yes") + var/body_color_input = input(usr,"Choose Shroud Color") as color|null + if(body_color_input) + body_color = sanitize_hexcolor(body_color_input, desired_format=6, include_crunch=1) + update_icon() +/obj/item/gun/ballistic/automatic/AM4B/examine(mob/user) + ..() + to_chat(user, "Alt-click to recolor it.") + +/obj/item/ammo_box/magazine/toy/AM4C + name = "foam force AM4-C magazine" + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "AM4MAG-32" + max_ammo = 32 + multiple_sprites = 0 + materials = list(MAT_METAL = 200) + +/obj/item/gun/ballistic/automatic/AM4C + name = "AM4-C" + desc = "A Relic from a bygone age. This one seems newer, yet less effective." + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "AM4C" + item_state = "arg" + mag_type = /obj/item/ammo_box/magazine/toy/AM4C + can_suppress = 0 + needs_permit = 0 + casing_ejector = 0 + spread = 45 //Assault Rifleeeeeee + w_class = WEIGHT_CLASS_NORMAL + burst_size = 4 //Shh. + fire_delay = 1 + +/datum/design/am4c + name = "Foam Force AM4-C Rifle" + id = "foam_am4c" + build_type = AUTOLATHE + materials = list(MAT_METAL = 24000, MAT_GLASS = 14000) + build_path = /obj/item/gun/ballistic/automatic/AM4C + category = list("hacked", "Misc") diff --git a/icons/obj/guns/cit_guns.dmi b/icons/obj/guns/cit_guns.dmi index 69d8f3781036493e2e76f1866a591be09c84c7b7..1cfa52b3cd452aa0cce575eb34a4b11a6d49a7b2 100644 GIT binary patch delta 5050 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 diff --git a/modular_citadel/code/modules/client/loadout/_donator.dm b/modular_citadel/code/modules/client/loadout/_donator.dm index 027a04a5fe..133973c0fa 100644 --- a/modular_citadel/code/modules/client/loadout/_donator.dm +++ b/modular_citadel/code/modules/client/loadout/_donator.dm @@ -168,3 +168,9 @@ category = slot_w_uniform path = /obj/item/clothing/suit/vermillion ckeywhitelist = list("fractious") + +/datum/gear/AM4B + name = "Foam Force AM4-B" + category = slot_in_backpack + path = /obj/item/gun/ballistic/automatic/AM4B + ckeywhitelist = list("zeronetalpha")