shotgun shell clips (#11955)
* shell clips revised by based ghom * lmao yeet better not forget that bit * nitpicking but also merge 11976 first * No freeloaders. * Update weapon_designs.dm Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com> Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
This commit is contained in:
@@ -113,7 +113,7 @@
|
||||
|
||||
/obj/item/ammo_box/update_icon()
|
||||
. = ..()
|
||||
desc = "[initial(desc)] There are [stored_ammo.len] shell\s left!"
|
||||
desc = "[initial(desc)] There [stored_ammo.len == 1 ? "is" : "are"] [stored_ammo.len] shell\s left!"
|
||||
for (var/material in bullet_cost)
|
||||
var/material_amount = bullet_cost[material]
|
||||
material_amount = (material_amount*stored_ammo.len) + base_cost[material]
|
||||
|
||||
@@ -121,3 +121,51 @@
|
||||
icon_state = "foambox_riot"
|
||||
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
|
||||
custom_materials = list(/datum/material/iron = 50000)
|
||||
|
||||
//Shotgun clips
|
||||
/obj/item/ammo_box/shotgun
|
||||
name = "stripper clip (shotgun shells)"
|
||||
desc = "A stripper clip, designed to help with loading a shotgun slightly faster."
|
||||
icon = 'icons/obj/ammo.dmi'
|
||||
icon_state = "shotgunclip"
|
||||
caliber = "shotgun" // slapped in to allow shell mix n match
|
||||
ammo_type = /obj/item/ammo_casing/shotgun
|
||||
max_ammo = 4
|
||||
var/pixeloffsetx = 4
|
||||
start_empty = TRUE
|
||||
|
||||
/obj/item/ammo_box/shotgun/update_overlays()
|
||||
. = ..()
|
||||
if(stored_ammo.len)
|
||||
var/offset = -4
|
||||
for(var/A in stored_ammo)
|
||||
var/obj/item/ammo_casing/shotgun/C = A
|
||||
offset += pixeloffsetx
|
||||
var/mutable_appearance/shell_overlay = mutable_appearance(icon, "[initial(C.icon_state)]-clip")
|
||||
shell_overlay.pixel_x += offset
|
||||
shell_overlay.appearance_flags = RESET_COLOR
|
||||
. += shell_overlay
|
||||
|
||||
/obj/item/ammo_box/shotgun/loaded
|
||||
start_empty = FALSE
|
||||
|
||||
/obj/item/ammo_box/shotgun/loaded/rubbershot
|
||||
ammo_type = /obj/item/ammo_casing/shotgun/rubbershot
|
||||
|
||||
/obj/item/ammo_box/shotgun/loaded/buckshot
|
||||
ammo_type = /obj/item/ammo_casing/shotgun/buckshot
|
||||
|
||||
/obj/item/ammo_box/shotgun/loaded/beanbag
|
||||
ammo_type = /obj/item/ammo_casing/shotgun/beanbag
|
||||
|
||||
/obj/item/ammo_box/shotgun/loaded/stunslug
|
||||
ammo_type = /obj/item/ammo_casing/shotgun/stunslug
|
||||
|
||||
/obj/item/ammo_box/shotgun/loaded/techshell
|
||||
ammo_type = /obj/item/ammo_casing/shotgun/techshell
|
||||
|
||||
/obj/item/ammo_box/shotgun/loaded/incendiary
|
||||
ammo_type = /obj/item/ammo_casing/shotgun/incendiary
|
||||
|
||||
/obj/item/ammo_box/shotgun/loaded/dart
|
||||
ammo_type = /obj/item/ammo_casing/shotgun/dart
|
||||
|
||||
@@ -135,6 +135,15 @@
|
||||
//Ammo Shells/
|
||||
//////////////
|
||||
|
||||
/datum/design/shell_clip
|
||||
name = "stripper clip (shotgun shells)"
|
||||
id = "sec_shellclip"
|
||||
build_type = PROTOLATHE
|
||||
materials = list(/datum/material/iron = 5000)
|
||||
build_path = /obj/item/ammo_box/shotgun
|
||||
category = list("Ammo")
|
||||
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
|
||||
|
||||
/datum/design/beanbag_slug/sec
|
||||
id = "sec_beanbag"
|
||||
build_type = PROTOLATHE
|
||||
@@ -166,7 +175,7 @@
|
||||
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
|
||||
|
||||
/datum/design/incendiary_slug/sec
|
||||
id = "sec_Islug"
|
||||
id = "sec_islug"
|
||||
build_type = PROTOLATHE
|
||||
category = list("Ammo")
|
||||
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
// Default research tech, prevents bricking
|
||||
design_ids = list("basic_matter_bin", "basic_cell", "basic_scanning", "basic_capacitor", "basic_micro_laser", "micro_mani", "desttagger", "handlabel", "packagewrap",
|
||||
"destructive_analyzer", "circuit_imprinter", "experimentor", "rdconsole", "design_disk", "tech_disk", "rdserver", "rdservercontrol", "mechfab",
|
||||
"space_heater", "beaker", "large_beaker", "bucket", "xlarge_beaker", "sec_beanbag", "sec_rshot", "sec_bshot", "sec_slug", "sec_Islug", "sec_dart", "sec_38", "sec_38lethal",
|
||||
"space_heater", "beaker", "large_beaker", "bucket", "xlarge_beaker", "sec_shellclip", "sec_beanbag", "sec_rshot", "sec_bshot", "sec_slug", "sec_islug", "sec_dart", "sec_38", "sec_38lethal",
|
||||
"rglass","plasteel","plastitanium","plasmaglass","plasmareinforcedglass","titaniumglass","plastitaniumglass")
|
||||
|
||||
/datum/techweb_node/mmi
|
||||
|
||||
Reference in New Issue
Block a user