diff --git a/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm b/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm index 929cac6fa74..e1de20e2b01 100644 --- a/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm +++ b/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm @@ -538,7 +538,7 @@ "akr" = (/obj/structure/rack,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/suit/space/vox/medic,/obj/item/clothing/head/helmet/space/vox/medic,/obj/item/clothing/mask/breath,/turf/simulated/shuttle/floor4/vox,/area/shuttle/vox) "aks" = (/obj/structure/rack,/obj/item/weapon/pneumatic_cannon,/obj/item/weapon/harpoon,/obj/item/weapon/harpoon,/obj/item/weapon/harpoon,/obj/item/weapon/harpoon,/obj/item/weapon/tank/nitrogen,/obj/machinery/light/spot{tag = "icon-tube1 (EAST)"; icon_state = "tube1"; dir = 4},/turf/simulated/shuttle/floor4/vox,/area/shuttle/vox) "akt" = (/turf/simulated/wall,/area/maintenance/disposal) -"aku" = (/obj/structure/rack,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/item/ammo_box/shotgun/rubbershot,/obj/item/ammo_box/shotgun/rubbershot,/obj/item/ammo_box/shotgun/rubbershot,/obj/item/ammo_box/shotgun/rubbershot,/obj/item/weapon/gun/projectile/shotgun/riot{pixel_x = -3; pixel_y = 3},/obj/item/weapon/gun/projectile/shotgun/riot{pixel_x = 2; pixel_y = -1},/turf/simulated/floor/plasteel{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/security/warden) +"aku" = (/obj/structure/rack,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/item/weapon/storage/box/rubbershot,/obj/item/weapon/storage/box/rubbershot,/obj/item/weapon/storage/box/rubbershot,/obj/item/weapon/storage/box/rubbershot,/obj/item/weapon/gun/projectile/shotgun/riot{pixel_x = -3; pixel_y = 3},/obj/item/weapon/gun/projectile/shotgun/riot{pixel_x = 2; pixel_y = -1},/turf/simulated/floor/plasteel{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/security/warden) "akv" = (/obj/structure/stool{pixel_y = 8},/obj/machinery/camera/autoname{dir = 4; network = list("SS13")},/turf/simulated/floor/plating,/area/maintenance/auxsolarport) "akw" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plating,/area/maintenance/auxsolarport) "akx" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/terminal,/obj/machinery/light/small{dir = 4},/obj/item/device/radio/intercom{frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29},/turf/simulated/floor/plating,/area/maintenance/auxsolarport) diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 6588c0fd90e..7ba0ceca95c 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -460,8 +460,8 @@ "aiR" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/wall/r_wall,/area/security/execution{name = "\improper Prisoner Transfer Center"}) "aiS" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 8},/area/security/permabrig) "aiT" = (/obj/structure/rack,/obj/structure/window/reinforced{dir = 1},/obj/item/weapon/gun/projectile/shotgun/riot{pixel_x = -3; pixel_y = 3},/obj/item/weapon/gun/projectile/shotgun/riot,/obj/item/weapon/gun/projectile/shotgun/riot{pixel_x = 3; pixel_y = -3},/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor/plasteel{dir = 8; icon_state = "vault"; tag = "icon-vault (WEST)"},/area/security/securearmoury) -"aiU" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/rack,/obj/item/ammo_box/shotgun/beanbag{pixel_x = -3; pixel_y = 3},/obj/item/ammo_box/shotgun/beanbag,/obj/item/ammo_box/shotgun/beanbag{pixel_x = -3; pixel_y = 3},/obj/item/ammo_box/shotgun/beanbag{pixel_x = -3; pixel_y = 3},/obj/item/ammo_box/shotgun/beanbag,/obj/item/ammo_box/shotgun/beanbag,/obj/item/ammo_box/shotgun/tranquilizer{pixel_x = 3; pixel_y = -3},/obj/machinery/ai_status_display{pixel_x = 0; pixel_y = 32},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plasteel{dir = 8; icon_state = "vault"; tag = "icon-vault (WEST)"},/area/security/securearmoury) -"aiV" = (/obj/structure/rack,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/item/ammo_box/shotgun/buck{pixel_x = -3; pixel_y = 3},/obj/item/ammo_box/shotgun/buck,/obj/item/ammo_box/shotgun/buck{pixel_x = 3; pixel_y = -3},/turf/simulated/floor/plasteel{dir = 8; icon_state = "vault"; tag = "icon-vault (WEST)"},/area/security/securearmoury) +"aiU" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/rack,/obj/item/weapon/storage/box/beanbag{pixel_x = -3; pixel_y = 3},/obj/item/weapon/storage/box/beanbag,/obj/item/weapon/storage/box/beanbag{pixel_x = -3; pixel_y = 3},/obj/item/weapon/storage/box/beanbag{pixel_x = -3; pixel_y = 3},/obj/item/weapon/storage/box/beanbag,/obj/item/weapon/storage/box/beanbag,/obj/item/weapon/storage/box/tranquilizer{pixel_x = 3; pixel_y = -3},/obj/machinery/ai_status_display{pixel_x = 0; pixel_y = 32},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plasteel{dir = 8; icon_state = "vault"; tag = "icon-vault (WEST)"},/area/security/securearmoury) +"aiV" = (/obj/structure/rack,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/item/weapon/storage/box/buck{pixel_x = -3; pixel_y = 3},/obj/item/weapon/storage/box/buck,/obj/item/weapon/storage/box/buck{pixel_x = 3; pixel_y = -3},/turf/simulated/floor/plasteel{dir = 8; icon_state = "vault"; tag = "icon-vault (WEST)"},/area/security/securearmoury) "aiW" = (/obj/item/toy/prize/honk,/turf/simulated/floor/plating,/area/maintenance/fpmaint) "aiX" = (/obj/item/device/radio/intercom{pixel_x = -28},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/hos) "aiY" = (/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/hos) diff --git a/_maps/map_files/cyberiad/z2.dmm b/_maps/map_files/cyberiad/z2.dmm index a5692e0ca1e..9cdd969cda8 100644 --- a/_maps/map_files/cyberiad/z2.dmm +++ b/_maps/map_files/cyberiad/z2.dmm @@ -152,7 +152,7 @@ "cV" = (/obj/effect/decal/cleanable/cobweb2,/turf/unsimulated/floor{name = "plating"},/area/prison/solitary) "cW" = (/obj/structure/stool/bed,/turf/unsimulated/floor{icon_state = "floorscorched2"},/area/prison/solitary) "cX" = (/obj/effect/decal/cleanable/blood,/turf/unsimulated/floor{name = "plating"},/area/prison/solitary) -"cY" = (/obj/structure/closet/secure_closet/guncabinet,/obj/item/ammo_box/shotgun/buck,/obj/item/ammo_box/shotgun/buck,/obj/item/ammo_box/shotgun/buck,/obj/item/weapon/gun/projectile/shotgun/automatic/combat,/obj/item/weapon/gun/projectile/shotgun/automatic/combat,/obj/item/weapon/gun/projectile/shotgun/automatic/combat,/turf/simulated/floor/engine,/area/shuttle/gamma/space) +"cY" = (/obj/structure/closet/secure_closet/guncabinet,/obj/item/weapon/storage/box/buck,/obj/item/weapon/storage/box/buck,/obj/item/weapon/storage/box/buck,/obj/item/weapon/gun/projectile/shotgun/automatic/combat,/obj/item/weapon/gun/projectile/shotgun/automatic/combat,/obj/item/weapon/gun/projectile/shotgun/automatic/combat,/turf/simulated/floor/engine,/area/shuttle/gamma/space) "cZ" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/mousetraps,/obj/item/weapon/storage/box/trackimp,/turf/unsimulated/floor{tag = "icon-dark"; icon_state = "dark"},/area/admin) "da" = (/obj/structure/table/reinforced,/obj/item/weapon/scalpel,/turf/unsimulated/floor{tag = "icon-dark"; icon_state = "dark"},/area/admin) "db" = (/turf/simulated/floor/holofloor{tag = "icon-carpet2-0 (EAST)"; icon_state = "carpet2-0"; dir = 4},/area/holodeck/source_theatre) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 22f231105ac..b36c3b38eb0 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -327,18 +327,20 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/security/armory/ballistic name = "Riot Shotguns Crate" - contains = list(/obj/item/weapon/gun/projectile/shotgun/riot, + contains = list(/obj/item/ammo_box/shotgun/buck, + /obj/item/weapon/gun/projectile/shotgun/riot, /obj/item/weapon/gun/projectile/shotgun/riot, /obj/item/weapon/gun/projectile/shotgun/riot, /obj/item/weapon/storage/belt/bandolier, /obj/item/weapon/storage/belt/bandolier, /obj/item/weapon/storage/belt/bandolier) - cost = 45 + cost = 50 containername = "riot shotgun crate" /datum/supply_packs/security/armory/ballisticauto name = "Combat Shotguns Crate" - contains = list(/obj/item/weapon/gun/projectile/shotgun/automatic/combat, + contains = list(/obj/item/ammo_box/shotgun/buck, + /obj/item/weapon/gun/projectile/shotgun/automatic/combat, /obj/item/weapon/gun/projectile/shotgun/automatic/combat, /obj/item/weapon/gun/projectile/shotgun/automatic/combat, /obj/item/weapon/storage/belt/bandolier, diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 0206b400690..8a487289e35 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -141,133 +141,71 @@ name = "Ammunition Box (Slug)" desc = "A small box capable of holding seven shotgun shells." icon_state = "slugbox" - storage_slots = 7 - can_hold = list( - "/obj/item/ammo_casing/shotgun" - ) - New() - ..() - new /obj/item/ammo_casing/shotgun(src) - new /obj/item/ammo_casing/shotgun(src) - new /obj/item/ammo_casing/shotgun(src) - new /obj/item/ammo_casing/shotgun(src) - new /obj/item/ammo_casing/shotgun(src) - new /obj/item/ammo_casing/shotgun(src) +/obj/item/weapon/storage/box/slug/New() + ..() + for(var/i in 1 to 7) new /obj/item/ammo_casing/shotgun(src) + /obj/item/weapon/storage/box/buck name = "Ammunition Box (Buckshot)" desc = "A small box capable of holding seven shotgun shells." icon_state = "buckshotbox" - storage_slots = 7 - can_hold = list( - "/obj/item/ammo_casing/shotgun" - ) - New() - ..() - new /obj/item/ammo_casing/shotgun/buckshot(src) - new /obj/item/ammo_casing/shotgun/buckshot(src) - new /obj/item/ammo_casing/shotgun/buckshot(src) - new /obj/item/ammo_casing/shotgun/buckshot(src) - new /obj/item/ammo_casing/shotgun/buckshot(src) - new /obj/item/ammo_casing/shotgun/buckshot(src) +/obj/item/weapon/storage/box/buck/New() + ..() + for(var/i in 1 to 7) new /obj/item/ammo_casing/shotgun/buckshot(src) /obj/item/weapon/storage/box/dragonsbreath name = "Ammunition Box (Dragonsbreath)" desc = "A small box capable of holding seven shotgun shells." icon_state = "dragonsbreathbox" - storage_slots = 7 - can_hold = list( - "/obj/item/ammo_casing/shotgun" - ) - New() - ..() - new /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath(src) - new /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath(src) - new /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath(src) - new /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath(src) - new /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath(src) - new /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath(src) +/obj/item/weapon/storage/box/dragonsbreath/New() + ..() + for(var/i in 1 to 7) new /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath(src) /obj/item/weapon/storage/box/stun name = "Ammunition Box (Stun shells)" desc = "A small box capable of holding seven shotgun shells." icon_state = "stunbox" - storage_slots = 7 - can_hold = list( - "/obj/item/ammo_casing/shotgun" - ) - New() - ..() - new /obj/item/ammo_casing/shotgun/stunslug(src) - new /obj/item/ammo_casing/shotgun/stunslug(src) - new /obj/item/ammo_casing/shotgun/stunslug(src) - new /obj/item/ammo_casing/shotgun/stunslug(src) - new /obj/item/ammo_casing/shotgun/stunslug(src) - new /obj/item/ammo_casing/shotgun/stunslug(src) +/obj/item/weapon/storage/box/stun/New() + ..() + for(var/i in 1 to 7) new /obj/item/ammo_casing/shotgun/stunslug(src) /obj/item/weapon/storage/box/beanbag name = "Ammunition Box (Beanbag shells)" desc = "A small box capable of holding seven shotgun shells." icon_state = "beanbagbox" - storage_slots = 7 - can_hold = list( - "/obj/item/ammo_casing/shotgun" - ) - New() - ..() - new /obj/item/ammo_casing/shotgun/beanbag(src) - new /obj/item/ammo_casing/shotgun/beanbag(src) - new /obj/item/ammo_casing/shotgun/beanbag(src) - new /obj/item/ammo_casing/shotgun/beanbag(src) - new /obj/item/ammo_casing/shotgun/beanbag(src) - new /obj/item/ammo_casing/shotgun/beanbag(src) +/obj/item/weapon/storage/box/beanbag/New() + ..() + for(var/i in 1 to 7) new /obj/item/ammo_casing/shotgun/beanbag(src) /obj/item/weapon/storage/box/rubbershot name = "Ammunition Box (Rubbershot shells)" desc = "A small box capable of holding seven shotgun shells." icon_state = "rubbershotbox" - storage_slots = 7 - can_hold = list( - "/obj/item/ammo_casing/shotgun" - ) - New() - ..() - new /obj/item/ammo_casing/shotgun/rubbershot(src) - new /obj/item/ammo_casing/shotgun/rubbershot(src) - new /obj/item/ammo_casing/shotgun/rubbershot(src) - new /obj/item/ammo_casing/shotgun/rubbershot(src) - new /obj/item/ammo_casing/shotgun/rubbershot(src) - new /obj/item/ammo_casing/shotgun/rubbershot(src) +/obj/item/weapon/storage/box/rubbershot/New() + ..() + for(var/i in 1 to 7) new /obj/item/ammo_casing/shotgun/rubbershot(src) /obj/item/weapon/storage/box/tranquilizer name = "Ammunition Box (Tranquilizer darts)" desc = "A small box capable of holding seven shotgun shells." icon_state = "tranqbox" - storage_slots = 7 - can_hold = list( - "/obj/item/ammo_casing/shotgun" - ) - New() - ..() - new /obj/item/ammo_casing/shotgun/tranquilizer(src) - new /obj/item/ammo_casing/shotgun/tranquilizer(src) - new /obj/item/ammo_casing/shotgun/tranquilizer(src) - new /obj/item/ammo_casing/shotgun/tranquilizer(src) - new /obj/item/ammo_casing/shotgun/tranquilizer(src) - new /obj/item/ammo_casing/shotgun/tranquilizer(src) +/obj/item/weapon/storage/box/tranquilizer/New() + ..() + for(var/i in 1 to 7) new /obj/item/ammo_casing/shotgun/tranquilizer(src) /obj/item/weapon/storage/box/flashbangs diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index f6364adea0f..286897c5014 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ