ff51c9d2db
* Improvised Weapons Part 1: Shotgun & Rifle Adds new sprites for ammo, the improvised rifle, the improvised shotgun. Adds a hand saw. Adds things to the crafting menu. Adds things to the autolathe menu. * PR not yet ready - just cleaning issues. Just trying to remark some of the issues resolved so I can see where I'm at a bit easier. * Reverting changes to shotgun ammo names in the autolathe. No point calling it 12G when there's no 20G anymore. * Weapon weight + sprite improvements. Makes sprites for gun parts bulkier with a low alpha pixel outline to make them easier to click on. They also look a bit closer to what their final product will be. * oops forgot the " * Revert "Merge branch 'master' into Improvised-Part-1" This reverts commit 1e43d228d1bc35b0582244ed0bd91934573b3cdd, reversing changes made to 207e9fccd4e8cffbe9ed26401a6f516fc44245dd. * Revert "Revert "Merge branch 'master' into Improvised-Part-1"" This reverts commit 22d421d010c4a4c5c5e26f49fe6bffcf6198df42. * My Github or environment isn't flipping out. no more. Derp. Also projectile damage modifier fixed. I can actually compile without hundreds of errors. * Made small weapon parts have w_class small. I was testing it out and seeing the trigger assembly take so much space in my inventory seemed really odd. * Duplicate definition refused. Hurrdurr I suck. Glad I gave this a quick look-voer. Shotgun description edited to reflect the 0.8x damage modifier. * Resolved tools.dmi merge conflict. Just took the dmi from master and put the new sprites on at the end. * DNM - Trying to see why usptream tools.dmi with my stuff added on the end is conflicting. * Please don't conflict
65 lines
2.2 KiB
Plaintext
65 lines
2.2 KiB
Plaintext
k// PARTS //
|
|
/obj/item/weaponcrafting
|
|
icon = 'icons/obj/improvised.dmi'
|
|
|
|
/obj/item/weaponcrafting/stock
|
|
name = "rifle stock"
|
|
desc = "A classic rifle stock that doubles as a grip, roughly carved out of wood."
|
|
custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 6)
|
|
icon_state = "riflestock"
|
|
|
|
/obj/item/weaponcrafting/durathread_string
|
|
name = "durathread string"
|
|
desc = "A long piece of durathread with some resemblance to cable coil."
|
|
icon_state = "durastring"
|
|
|
|
////////////////////////////////
|
|
// KAT IMPROVISED WEAPON PARTS//
|
|
////////////////////////////////
|
|
|
|
/obj/item/weaponcrafting/improvised_parts
|
|
name = "Eerie bunch of coloured dots."
|
|
desc = "You feel the urge to report to Central that the parent type of guncrafting, which should never appear in this reality, has appeared. Whatever that means."
|
|
icon = 'icons/obj/guns/gun_parts.dmi'
|
|
icon_state = "palette"
|
|
|
|
// BARRELS
|
|
|
|
/obj/item/weaponcrafting/improvised_parts/barrel_rifle
|
|
name = "rifle barrel"
|
|
desc = "A pipe with a diameter just the right size to fire 7.62 rounds out of."
|
|
icon_state = "barrel_rifle"
|
|
|
|
/obj/item/weaponcrafting/improvised_parts/barrel_shotgun
|
|
name = "shotgun barrel"
|
|
desc = "A twenty bore shotgun barrel."
|
|
icon_state = "barrel_shotgun"
|
|
|
|
// RECEIVERS
|
|
|
|
/obj/item/weaponcrafting/improvised_parts/rifle_receiver
|
|
name = "bolt action receiver"
|
|
desc = "A crudely constructed receiver to create an improvised bolt-action breechloaded rifle."
|
|
icon_state = "receiver_rifle"
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
|
|
/obj/item/weaponcrafting/improvised_parts/shotgun_receiver
|
|
name = "break-action assembly"
|
|
desc = "An improvised receiver to create a break-action breechloaded shotgun."
|
|
icon_state = "receiver_shotgun"
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
|
|
// MISC
|
|
|
|
/obj/item/weaponcrafting/improvised_parts/trigger_assembly
|
|
name = "firearm trigger assembly"
|
|
desc = "A modular trigger assembly with a firing pin, this can be used to make a whole bunch of improvised firearss."
|
|
icon_state = "trigger_assembly"
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
|
|
/obj/item/weaponcrafting/improvised_parts/wooden_body
|
|
name = "wooden firearm body"
|
|
desc = "A crudely fashioned wooden body to help keep higher calibre improvised weapons from blowing themselves apart."
|
|
icon_state = "wooden_body"
|
|
|