diff --git a/code/game/objects/items/surplus_voucher_ch.dm b/code/game/objects/items/surplus_voucher_ch.dm index f46344dcba..818bda9bbc 100644 --- a/code/game/objects/items/surplus_voucher_ch.dm +++ b/code/game/objects/items/surplus_voucher_ch.dm @@ -143,8 +143,8 @@ prob(4);/obj/item/weapon/storage/box/handcuffs, prob(3);/obj/item/weapon/reagent_containers/spray/pepper, prob(3);/obj/item/weapon/melee/baton/loaded, - prob(2);/obj/item/weapon/storage/box/beanbags, - prob(2);/obj/item/weapon/storage/box/stunshells, + prob(2);/obj/item/ammo_magazine/ammo_box/b12g/beanbag, + prob(2);/obj/item/ammo_magazine/ammo_box/b12g/stunshell, prob(2);/obj/item/ammo_magazine/m45/rubber, prob(2);/obj/item/ammo_magazine/m9mmt/rubber, prob(2);/obj/item/weapon/cell/device/weapon, diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 8db3c36e18..18d0ef948f 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -142,129 +142,6 @@ /obj/item/weapon/dnainjector/m2h = 3 ) -<<<<<<< HEAD -/obj/item/weapon/storage/box/blanks - name = "box of blank shells" - desc = "It has a picture of a gun and several warning symbols on the front." - icon_state = "blankshot_box" - item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit") - starts_with = list(/obj/item/ammo_casing/a12g/blank = 8) - drop_sound = 'sound/items/drop/ammobox.ogg' - pickup_sound = 'sound/items/pickup/ammobox.ogg' - -/obj/item/weapon/storage/box/blanks/large - starts_with = list(/obj/item/ammo_casing/a12g/blank = 16) - -/obj/item/weapon/storage/box/beanbags - name = "box of beanbag shells" - desc = "It has a picture of a gun and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death." - icon_state = "beanshot_box" - item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit") - starts_with = list(/obj/item/ammo_casing/a12g/beanbag = 8) - drop_sound = 'sound/items/drop/ammobox.ogg' - pickup_sound = 'sound/items/pickup/ammobox.ogg' - -/obj/item/weapon/storage/box/beanbags/large - starts_with = list(/obj/item/ammo_casing/a12g/beanbag = 16) - -/obj/item/weapon/storage/box/shotgunammo - name = "box of shotgun slugs" - desc = "It has a picture of a gun and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death." - icon_state = "lethalshellshot_box" - item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit") - starts_with = list(/obj/item/ammo_casing/a12g = 8) - drop_sound = 'sound/items/drop/ammobox.ogg' - pickup_sound = 'sound/items/pickup/ammobox.ogg' - -/obj/item/weapon/storage/box/shotgunammo/large - starts_with = list(/obj/item/ammo_casing/a12g = 16) - -/obj/item/weapon/storage/box/shotgunshells - name = "box of shotgun shells" - desc = "It has a picture of a gun and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death." - icon_state = "lethalslug_box" - item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit") - starts_with = list(/obj/item/ammo_casing/a12g/pellet = 8) - drop_sound = 'sound/items/drop/ammobox.ogg' - pickup_sound = 'sound/items/pickup/ammobox.ogg' - -/obj/item/weapon/storage/box/shotgunshells/large - starts_with = list(/obj/item/ammo_casing/a12g/pellet = 16) - -/obj/item/weapon/storage/box/flashshells - name = "box of illumination shells" - desc = "It has a picture of a gun and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death." - icon_state = "illumshot_box" - item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit") - starts_with = list(/obj/item/ammo_casing/a12g/flash = 8) - drop_sound = 'sound/items/drop/ammobox.ogg' - pickup_sound = 'sound/items/pickup/ammobox.ogg' - -/obj/item/weapon/storage/box/flashshells/large - starts_with = list(/obj/item/ammo_casing/a12g/flash = 16) - -/obj/item/weapon/storage/box/stunshells - name = "box of stun shells" - desc = "It has a picture of a gun and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death." - icon_state = "stunshot_box" - item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit") - starts_with = list(/obj/item/ammo_casing/a12g/stunshell = 8) - drop_sound = 'sound/items/drop/ammobox.ogg' - pickup_sound = 'sound/items/pickup/ammobox.ogg' - -/obj/item/weapon/storage/box/stunshells/large - starts_with = list(/obj/item/ammo_casing/a12g/stunshell = 16) - -/obj/item/weapon/storage/box/practiceshells - name = "box of practice shells" - desc = "It has a picture of a gun and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death." - icon_state = "blankshot_box" - item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit") - starts_with = list(/obj/item/ammo_casing/a12g/practice = 8) - drop_sound = 'sound/items/drop/ammobox.ogg' - pickup_sound = 'sound/items/pickup/ammobox.ogg' - -/obj/item/weapon/storage/box/practiceshells/large - starts_with = list(/obj/item/ammo_casing/a12g/practice = 16) - -/obj/item/weapon/storage/box/empshells - name = "box of emp shells" - desc = "It has a picture of a gun and several warning symbols on the front." - icon_state = "empshot_box" - item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit") - starts_with = list(/obj/item/ammo_casing/a12g/emp = 8) - drop_sound = 'sound/items/drop/ammobox.ogg' - pickup_sound = 'sound/items/pickup/ammobox.ogg' - -/obj/item/weapon/storage/box/empshells/large - starts_with = list(/obj/item/ammo_casing/a12g/emp = 16) - -/obj/item/weapon/storage/box/flechetteshells - name = "box of shotgun flechettes" - desc = "It has a picture of a gun and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death." - icon_state = "lethalslug_box" - item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit") - starts_with = list(/obj/item/ammo_casing/a12g/flechette = 8) - drop_sound = 'sound/items/drop/ammobox.ogg' - pickup_sound = 'sound/items/pickup/ammobox.ogg' - -/obj/item/weapon/storage/box/flechetteshells/large - starts_with = list(/obj/item/ammo_casing/a12g/flechette = 16) - -/obj/item/weapon/storage/box/sniperammo - name = "box of 14.5mm shells" - desc = "It has a picture of a gun and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death." - starts_with = list(/obj/item/ammo_casing/a145 = 7) - drop_sound = 'sound/items/drop/ammobox.ogg' - pickup_sound = 'sound/items/pickup/ammobox.ogg' - -/obj/item/weapon/storage/box/sniperammo/highvel - name = "box of 14.5mm sabot shells" - desc = "It has a picture of a gun and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death." - starts_with = list(/obj/item/ammo_casing/a145/highvel = 7) - -======= ->>>>>>> 27b451a2c81... Merge pull request #12353 from GhostActual/Ammo_Boxes /obj/item/weapon/storage/box/flashbangs name = "box of flashbangs (WARNING)" desc = "WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use." diff --git a/code/modules/projectiles/guns/projectile/automatic_ch.dm b/code/modules/projectiles/guns/projectile/automatic_ch.dm index e0338d8629..aa7cf3b00f 100644 --- a/code/modules/projectiles/guns/projectile/automatic_ch.dm +++ b/code/modules/projectiles/guns/projectile/automatic_ch.dm @@ -10,8 +10,8 @@ origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 1, TECH_ILLEGAL = 4) slot_flags = SLOT_BACK load_method = MAGAZINE - magazine_type = /obj/item/ammo_magazine/m762m - allowed_magazines = list(/obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762m) + magazine_type = /obj/item/ammo_magazine/m762/ext + allowed_magazines = list(/obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762/ext) projectile_type = /obj/item/projectile/bullet/rifle/a762 firemodes = list( diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 48e0b683b0..77afc93fae 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -304,7 +304,6 @@ damage = 5 agony = 10 -<<<<<<< HEAD /obj/item/projectile/beam/precursor //CHOMPedit added Precursor beam name = "precursor beam" icon_state = "alien beam" @@ -317,7 +316,6 @@ damage = 48 armor_penetration = 10 -======= /obj/item/projectile/beam/eluger name = "laser beam" icon_state = "xray" @@ -411,4 +409,3 @@ M.adjustToxLoss(-5) M.adjustOxyLoss(-5) return 1 ->>>>>>> 27b451a2c81... Merge pull request #12353 from GhostActual/Ammo_Boxes diff --git a/code/modules/research/designs/weapons.dm b/code/modules/research/designs/weapons.dm index 067ff1ae65..f6644babaa 100644 --- a/code/modules/research/designs/weapons.dm +++ b/code/modules/research/designs/weapons.dm @@ -1,269 +1,3 @@ -<<<<<<< HEAD -/datum/design/item/weapon/AssembleDesignName() - ..() - name = "Weapon prototype ([item_name])" - -/datum/design/item/weapon/ammo/AssembleDesignName() - ..() - name = "Weapon ammo prototype ([item_name])" - -/datum/design/item/weapon/AssembleDesignDesc() - if(!desc) - if(build_path) - var/obj/item/I = build_path - desc = initial(I.desc) - ..() - -// Energy weapons - -/datum/design/item/weapon/energy/AssembleDesignName() - ..() - name = "Energy weapon prototype ([item_name])" - -/datum/design/item/weapon/energy/stunrevolver - id = "stunrevolver" - req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2) - materials = list(MAT_STEEL = 4000) - build_path = /obj/item/weapon/gun/energy/stunrevolver - sort_string = "MAAAA" - -/datum/design/item/weapon/energy/nuclear_gun - id = "nuclear_gun" - req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 5, TECH_POWER = 3) - materials = list(MAT_STEEL = 5000, MAT_GLASS = 1000, "uranium" = 500) - build_path = /obj/item/weapon/gun/energy/gun/nuclear - sort_string = "MAAAB" - -/datum/design/item/weapon/energy/phoronpistol - id = "ppistol" - req_tech = list(TECH_COMBAT = 5, TECH_PHORON = 4) - materials = list(MAT_STEEL = 5000, MAT_GLASS = 1000, "phoron" = 3000) - build_path = /obj/item/weapon/gun/energy/toxgun - sort_string = "MAAAC" - -/datum/design/item/weapon/energy/lasercannon - desc = "The lasing medium of this prototype is enclosed in a tube lined with uranium-235 and subjected to high neutron flux in a nuclear reactor core." - id = "lasercannon" - req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_POWER = 3) - materials = list(MAT_STEEL = 10000, MAT_GLASS = 1000, "diamond" = 2000) - build_path = /obj/item/weapon/gun/energy/lasercannon - sort_string = "MAAAD" - -/datum/design/item/weapon/energy/decloner - id = "decloner" - req_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 7, TECH_BIO = 5, TECH_POWER = 6) - materials = list("gold" = 5000,"uranium" = 10000) - build_path = /obj/item/weapon/gun/energy/decloner - sort_string = "MAAAE" - -/datum/design/item/weapon/energy/temp_gun - desc = "A gun that shoots high-powered glass-encased energy temperature bullets." - id = "temp_gun" - req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 4, TECH_POWER = 3, TECH_MAGNET = 2) - materials = list(MAT_STEEL = 5000, MAT_GLASS = 500, "silver" = 3000) - build_path = /obj/item/weapon/gun/energy/temperature - sort_string = "MAAAF" - -/datum/design/item/weapon/energy/flora_gun - id = "flora_gun" - req_tech = list(TECH_MATERIAL = 2, TECH_BIO = 3, TECH_POWER = 3) - materials = list(MAT_STEEL = 2000, MAT_GLASS = 500, "uranium" = 500) - build_path = /obj/item/weapon/gun/energy/floragun - sort_string = "MAAAG" - -/datum/design/item/weapon/energy/vinstunrevolver - id = "vinstunrevolver" - req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2) - materials = list(MAT_STEEL = 4000) - build_path = /obj/item/weapon/gun/energy/stunrevolver/vintage - sort_string = "MAAAH" - -// Ballistic weapons - -/datum/design/item/weapon/ballistic/AssembleDesignName() - ..() - name = "Ballistic weapon prototype ([item_name])" - -/datum/design/item/weapon/ballistic/advanced_smg - id = "smg" - desc = "An advanced 9mm SMG with a reflective laser optic." - req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3) - materials = list(MAT_STEEL = 8000, "silver" = 2000, "diamond" = 1000) - build_path = /obj/item/weapon/gun/projectile/automatic/advanced_smg - sort_string = "MABAA" - -// Ballistic ammo - -/datum/design/item/weapon/ballistic/ammo/AssembleDesignName() - ..() - name = "Ballistic weapon ammo prototype ([name])" - -/datum/design/item/weapon/ballistic/ammo/ammo_9mmAdvanced - name = "9mm magazine" - id = "ammo_9mm" - desc = "A 21 round magazine for an advanced 9mm SMG." - req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3) - materials = list(MAT_STEEL = 3750, "silver" = 100) // Requires silver for proprietary magazines! Or something. - build_path = /obj/item/ammo_magazine/m9mmAdvanced - sort_string = "MABBA" - -/datum/design/item/weapon/ballistic/ammo/stunshell - name = "stun shells" - desc = "A stunning shell for a shotgun." - id = "stunshell" - req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3) - materials = list(MAT_STEEL = 4000) - build_path = /obj/item/weapon/storage/box/stunshells - sort_string = "MABBB" - -/datum/design/item/weapon/ballistic/ammo/empshell - name = "emp shells" - desc = "An electromagnetic shell for a shotgun." - id = "empshell" - req_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 3) - materials = list(MAT_STEEL = 4000, MAT_URANIUM = 1000) - build_path = /obj/item/weapon/storage/box/empshells - sort_string = "MABBC" - -// Phase weapons - -/datum/design/item/weapon/phase/AssembleDesignName() - ..() - name = "Phase weapon prototype ([item_name])" - -/* //VOREStation Removal Start // Chomp Edit : uncomment those weapons //CHOMP Edit: Comment again, move to weapons_ch because they have weapons locks now. -/datum/design/item/weapon/phase/phase_pistol - id = "phasepistol" - req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2, TECH_POWER = 2) - materials = list(MAT_STEEL = 4000) - build_path = /obj/item/weapon/gun/energy/phasegun/pistol - sort_string = "MACAA" - -/datum/design/item/weapon/phase/phase_carbine - id = "phasecarbine" - req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 2, TECH_POWER = 2) - materials = list(MAT_STEEL = 6000, MAT_GLASS = 1500) - build_path = /obj/item/weapon/gun/energy/phasegun - sort_string = "MACAB" - -/datum/design/item/weapon/phase/phase_rifle - id = "phaserifle" - req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_POWER = 3) - materials = list(MAT_STEEL = 7000, MAT_GLASS = 2000, "silver" = 500) - build_path = /obj/item/weapon/gun/energy/phasegun/rifle - sort_string = "MACAC" - -/datum/design/item/weapon/phase/phase_cannon - id = "phasecannon" - req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 4, TECH_POWER = 4) - materials = list(MAT_STEELL = 10000, MAT_GLASS = 2000, "silver" = 1000, "diamond" = 750) - build_path = /obj/item/weapon/gun/energy/phasegun/cannon - sort_string = "MACAD" -*/ //VOREStation Removal End // Chomp Edit : uncomment those weapons - -// Other weapons - -/datum/design/item/weapon/rapidsyringe - id = "rapidsyringe" - req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_BIO = 2) - materials = list(MAT_STEEL = 5000, MAT_GLASS = 1000) - build_path = /obj/item/weapon/gun/launcher/syringe/rapid - sort_string = "MADAA" - -/datum/design/item/weapon/dartgun - desc = "A gun that fires small hollow chemical-payload darts." - id = "dartgun_r" - req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 4, TECH_BIO = 4, TECH_MAGNET = 3, TECH_ILLEGAL = 1) - materials = list(MAT_STEEL = 5000, "gold" = 5000, "silver" = 2500, MAT_GLASS = 750) - build_path = /obj/item/weapon/gun/projectile/dartgun/research - sort_string = "MADAB" - -/datum/design/item/weapon/chemsprayer - desc = "An advanced chem spraying device." - id = "chemsprayer" - req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_BIO = 2) - materials = list(MAT_STEEL = 5000, MAT_GLASS = 1000) - build_path = /obj/item/weapon/reagent_containers/spray/chemsprayer - sort_string = "MADAC" - -/datum/design/item/weapon/fuelrod - id = "fuelrod_gun" - req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 4, TECH_PHORON = 4, TECH_ILLEGAL = 5, TECH_MAGNET = 5) - materials = list(MAT_STEEL = 10000, MAT_GLASS = 2000, "gold" = 500, "silver" = 500, "uranium" = 1000, "phoron" = 3000, "diamond" = 1000) - build_path = /obj/item/weapon/gun/magnetic/fuelrod - sort_string = "MADAD" - -// Ammo for those - -/datum/design/item/weapon/ammo/dartgunmag_small - id = "dartgun_mag_s" - req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_MAGNET = 1, TECH_ILLEGAL = 1) - materials = list(MAT_STEEL = 300, "gold" = 100, "silver" = 100, MAT_GLASS = 300) - build_path = /obj/item/ammo_magazine/chemdart/small - sort_string = "MADBA" - -/datum/design/item/weapon/ammo/dartgun_ammo_small - id = "dartgun_ammo_s" - req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_MAGNET = 1, TECH_ILLEGAL = 1) - materials = list(MAT_STEEL = 50, "gold" = 30, "silver" = 30, MAT_GLASS = 50) - build_path = /obj/item/ammo_casing/chemdart/small - sort_string = "MADBB" - -/datum/design/item/weapon/ammo/dartgunmag_med - id = "dartgun_mag_m" - req_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_MAGNET = 1, TECH_ILLEGAL = 1) - materials = list(MAT_STEEL = 500, "gold" = 150, "silver" = 150, "diamond" = 200, MAT_GLASS = 400) - build_path = /obj/item/ammo_magazine/chemdart - sort_string = "MADBC" - -/datum/design/item/weapon/ammo/dartgun_ammo_med - id = "dartgun_ammo_m" - req_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_MAGNET = 1, TECH_ILLEGAL = 1) - materials = list(MAT_STEEL = 80, "gold" = 40, "silver" = 40, MAT_GLASS = 60) - build_path = /obj/item/ammo_casing/chemdart - sort_string = "MADBD" - -/datum/design/item/weapon/ammo/flechette - id = "magnetic_ammo" - req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 4, TECH_MAGNET = 4) - materials = list(MAT_STEEL = 500, "gold" = 300, MAT_GLASS = 150, MAT_PHORON = 100) - build_path = /obj/item/weapon/magnetic_ammo - sort_string = "MADBE" - -// Melee weapons - -/datum/design/item/weapon/melee/AssembleDesignName() - ..() - name = "Melee weapon prototype ([item_name])" - -/datum/design/item/weapon/melee/esword - name = "Portable Energy Blade" - id = "chargesword" - req_tech = list(TECH_COMBAT = 6, TECH_MAGNET = 4, TECH_ENGINEERING = 5, TECH_ILLEGAL = 4, TECH_ARCANE = 1) - materials = list(MAT_PLASTEEL = 3500, MAT_GLASS = 1000, MAT_LEAD = 2250, MAT_METALHYDROGEN = 500) - build_path = /obj/item/weapon/melee/energy/sword/charge - sort_string = "MBAAA" - -/datum/design/item/weapon/melee/eaxe - name = "Energy Axe" - id = "chargeaxe" - req_tech = list(TECH_COMBAT = 6, TECH_MAGNET = 5, TECH_ENGINEERING = 4, TECH_ILLEGAL = 4) - materials = list(MAT_PLASTEEL = 3500, MAT_OSMIUM = 2000, MAT_LEAD = 2000, MAT_METALHYDROGEN = 500) - build_path = /obj/item/weapon/melee/energy/axe/charge - sort_string = "MBAAB" - -// Grenade stuff -/datum/design/item/weapon/grenade/AssembleDesignName() - ..() - name = "Grenade casing prototype ([item_name])" - -/datum/design/item/weapon/grenade/large_grenade - id = "large_Grenade" - req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2) - materials = list(MAT_STEEL = 3000) - build_path = /obj/item/weapon/grenade/chem_grenade/large - sort_string = "MCAAA" -======= /datum/design/item/weapon/AssembleDesignName() ..() name = "Weapon prototype ([item_name])" @@ -528,4 +262,3 @@ materials = list(MAT_STEEL = 3000) build_path = /obj/item/weapon/grenade/chem_grenade/large sort_string = "MCAAA" ->>>>>>> 27b451a2c81... Merge pull request #12353 from GhostActual/Ammo_Boxes diff --git a/maps/southern_cross/southern_cross-2.dmm b/maps/southern_cross/southern_cross-2.dmm index 85ffe4a4cf..bb89252da2 100644 --- a/maps/southern_cross/southern_cross-2.dmm +++ b/maps/southern_cross/southern_cross-2.dmm @@ -345,7 +345,7 @@ "ajZ" = (/obj/structure/closet/wardrobe/atmospherics_yellow,/obj/effect/floor_decal/spline/plain{dir = 4},/obj/machinery/ai_status_display{layer = 4; pixel_x = -32},/turf/simulated/floor/tiled/yellow,/area/engineering/locker_room) "aka" = (/obj/structure/closet/secure_closet/atmos_personal,/obj/effect/floor_decal/spline/plain{dir = 8},/turf/simulated/floor/tiled/yellow,/area/engineering/locker_room) "akd" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled/dark,/area/security/armoury) -"akh" = (/obj/structure/table/rack{dir = 8; layer = 2.6},/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced{dir = 1},/obj/effect/floor_decal/corner/red/full{dir = 1},/obj/item/weapon/storage/box/flashshells,/obj/item/weapon/storage/box/beanbags,/obj/item/weapon/storage/box/beanbags,/obj/item/weapon/storage/box/stunshells,/obj/item/weapon/storage/box/stunshells,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/window/brigdoor/westright{name = "Ammo"},/turf/simulated/floor/tiled/dark,/area/security/armoury) +"akh" = (/obj/structure/table/rack{dir = 8; layer = 2.6},/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced{dir = 1},/obj/effect/floor_decal/corner/red/full{dir = 1},/obj/item/ammo_magazine/ammo_box/b12g/flash,/obj/item/ammo_magazine/ammo_box/b12g/beanbag,/obj/item/ammo_magazine/ammo_box/b12g/beanbag,/obj/item/ammo_magazine/ammo_box/b12g/stunshell,/obj/item/ammo_magazine/ammo_box/b12g/stunshell,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/window/brigdoor/westright{name = "Ammo"},/turf/simulated/floor/tiled/dark,/area/security/armoury) "akk" = (/obj/machinery/atmospherics/pipe/simple/visible/yellow{dir = 6},/turf/simulated/floor/tiled,/area/engineering/atmos) "ako" = (/obj/machinery/hologram/holopad,/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/engineering/atmos) "akr" = (/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/portable_atmospherics/canister/air/airlock,/turf/simulated/floor,/area/maintenance/security_port) @@ -379,7 +379,7 @@ "alz" = (/obj/structure/table/standard,/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_y = 24},/obj/machinery/light_switch{pixel_x = 11; pixel_y = 24},/obj/item/weapon/towel{color = "#FF8C00"; name = "orange towel"; pixel_x = -2; pixel_y = -4},/obj/item/weapon/towel{color = "#FF8C00"; name = "orange towel"; pixel_x = -2; pixel_y = -4},/obj/item/weapon/towel{color = "#FFD700"; name = "gold towel"},/obj/item/weapon/towel{color = "#FFD700"; name = "gold towel"},/obj/item/weapon/towel{color = "#00FFFF"; name = "cyan towel"; pixel_x = 2; pixel_y = 4},/obj/item/weapon/towel{color = "#00FFFF"; name = "cyan towel"; pixel_x = 2; pixel_y = 4},/obj/random/soap,/obj/random/soap,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/tiled/freezer,/area/engineering/engi_restroom) "alB" = (/obj/structure/undies_wardrobe,/obj/structure/window/basic,/turf/simulated/floor/tiled/freezer,/area/engineering/engi_restroom) "alF" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/tiled/dark,/area/security/tactical) -"alG" = (/obj/structure/table/rack{dir = 8; layer = 2.6},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/effect/floor_decal/corner/green/full{dir = 4},/obj/item/weapon/storage/box/shotgunshells,/obj/item/weapon/storage/box/shotgunshells,/obj/item/weapon/storage/box/shotgunammo,/obj/item/weapon/storage/box/shotgunammo,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/machinery/door/window/brigdoor/westleft{name = "Ammo"},/obj/item/ammo_magazine/m9mmp90,/obj/item/ammo_magazine/m9mmp90,/obj/item/ammo_magazine/m9mmp90,/obj/item/ammo_magazine/m9mmp90,/obj/item/ammo_magazine/m9mmp90,/obj/item/ammo_magazine/m762garand,/obj/item/ammo_magazine/m762garand,/obj/item/ammo_magazine/m762garand,/obj/item/ammo_magazine/m762garand,/obj/item/weapon/storage/box/shotgunammo,/obj/item/weapon/storage/box/shotgunammo,/obj/item/weapon/storage/box/shotgunshells,/turf/simulated/floor/tiled/dark,/area/security/tactical) +"alG" = (/obj/structure/table/rack{dir = 8; layer = 2.6},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/effect/floor_decal/corner/green/full{dir = 4},/obj/item/ammo_magazine/ammo_box/b12g/pellet,/obj/item/ammo_magazine/ammo_box/b12g/pellet,/obj/item/ammo_magazine/ammo_box/b12g,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/machinery/door/window/brigdoor/westleft{name = "Ammo"},/obj/item/ammo_magazine/m9mmp90,/obj/item/ammo_magazine/m9mmp90,/obj/item/ammo_magazine/m9mmp90,/obj/item/ammo_magazine/m9mmp90,/obj/item/ammo_magazine/m9mmp90,/turf/simulated/floor/tiled/dark,/area/security/tactical) "alH" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 10},/turf/simulated/wall/r_wall,/area/maintenance/security_port) "alI" = (/obj/structure/flora/ausbushes/sparsegrass,/turf/simulated/floor/grass,/area/hallway/primary/seconddeck/fpcenter) "alK" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/floor_decal/borderfloor/corner,/obj/effect/floor_decal/corner/red/bordercorner,/turf/simulated/floor/tiled,/area/hallway/primary/seconddeck/fpcenter) @@ -1583,7 +1583,7 @@ "bca" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/item/device/radio/intercom{desc = "Talk... listen through this."; name = "Station Intercom (Brig Radio)"; pixel_y = -21; wires = 7},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/red/border,/turf/simulated/floor/tiled,/area/security/range) "bcb" = (/obj/structure/closet/crate,/obj/item/target,/obj/item/target,/obj/item/target,/obj/item/target,/obj/item/target,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/obj/machinery/light,/obj/machinery/firealarm{dir = 1; pixel_y = -26},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/red/border,/turf/simulated/floor/tiled,/area/security/range) "bcc" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/storage/box/flashbangs{pixel_x = -2; pixel_y = -2},/obj/machinery/recharger/wallcharger{pixel_x = 4; pixel_y = -26},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/red/border,/turf/simulated/floor/tiled,/area/security/range) -"bcd" = (/obj/machinery/recharger/wallcharger{pixel_x = 4; pixel_y = -26},/obj/structure/table/steel_reinforced,/obj/item/weapon/storage/box/blanks,/obj/item/weapon/storage/box/blanks{pixel_x = 2; pixel_y = -2},/obj/item/ammo_magazine/m9mmt/practice,/obj/item/ammo_magazine/m9mmt/practice,/obj/item/ammo_magazine/m45/practice,/obj/item/ammo_magazine/m45/practice,/obj/item/ammo_magazine/m45/practice,/obj/item/ammo_magazine/m45/practice,/obj/item/ammo_magazine/m45/practice,/obj/item/ammo_magazine/m45/practice,/obj/machinery/alarm{dir = 8; pixel_x = 22},/obj/item/ammo_magazine/s45/practice,/obj/item/ammo_magazine/s45/practice,/obj/item/ammo_magazine/s45/practice,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/red/border,/turf/simulated/floor/tiled,/area/security/range) +"bcd" = (/obj/machinery/recharger/wallcharger{pixel_x = 4; pixel_y = -26},/obj/structure/table/steel_reinforced,/obj/item/ammo_magazine/m9mmt/practice,/obj/item/ammo_magazine/m9mmt/practice,/obj/item/ammo_magazine/m45/practice,/obj/item/ammo_magazine/m45/practice,/obj/item/ammo_magazine/m45/practice,/obj/item/ammo_magazine/m45/practice,/obj/item/ammo_magazine/m45/practice,/obj/item/ammo_magazine/m45/practice,/obj/machinery/alarm{dir = 8; pixel_x = 22},/obj/item/ammo_magazine/s45/practice,/obj/item/ammo_magazine/s45/practice,/obj/item/ammo_magazine/s45/practice,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/red/border,/turf/simulated/floor/tiled,/area/security/range) "bce" = (/turf/simulated/wall,/area/rnd/test_area) "bcf" = (/obj/machinery/door/airlock/external{name = "Toxins Test Chamber"},/turf/simulated/floor/airless,/area/rnd/test_area) "bcg" = (/turf/simulated/floor/reinforced/nitrogen,/area/engineering/atmos) @@ -5677,7 +5677,7 @@ "nKR" = (/obj/random/obstruction,/obj/machinery/atmospherics/pipe/simple/hidden/universal,/turf/simulated/floor/plating,/area/maintenance/research) "nLg" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/obj/effect/landmark{name = "Observer-Start"},/obj/effect/landmark/start,/turf/simulated/floor/tiled,/area/hallway/primary/seconddeck/dockhallway) "nMj" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway2) -"nMm" = (/obj/structure/table/woodentable,/obj/item/weapon/storage/box/beanbags,/obj/item/weapon/gun/projectile/shotgun/doublebarrel,/obj/item/weapon/tool/screwdriver,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/item/device/radio/intercom{desc = "Talk... listen through this."; name = "Station Intercom (Brig Radio)"; pixel_y = -21; wires = 7},/turf/simulated/floor/wood,/area/crew_quarters/bar) +"nMm" = (/obj/structure/table/woodentable,/obj/item/weapon/gun/projectile/shotgun/doublebarrel,/obj/item/weapon/tool/screwdriver,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/item/device/radio/intercom{desc = "Talk... listen through this."; name = "Station Intercom (Brig Radio)"; pixel_y = -21; wires = 7},/turf/simulated/floor/wood,/area/crew_quarters/bar) "nMn" = (/obj/structure/filingcabinet/chestdrawer,/obj/effect/floor_decal/borderfloorwhite{dir = 10},/obj/effect/floor_decal/corner/purple/border{dir = 10},/turf/simulated/floor/tiled/white,/area/rnd/lab) "nMv" = (/obj/machinery/door/firedoor/border_only,/obj/structure/disposalpipe/segment,/obj/effect/wingrille_spawn/reinforced/polarized{id = "lounge_window_tint"},/turf/simulated/floor/plating,/area/hallway/secondary/entry/docking_lounge) "nNE" = (/obj/structure/bed/chair/office/light,/obj/effect/floor_decal/borderfloorwhite/corner{dir = 8},/obj/effect/floor_decal/corner/purple/bordercorner{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/lab) diff --git a/maps/southern_cross/southern_cross-8.dmm b/maps/southern_cross/southern_cross-8.dmm index 9ce2b5ba75..c4770f4c54 100644 --- a/maps/southern_cross/southern_cross-8.dmm +++ b/maps/southern_cross/southern_cross-8.dmm @@ -6516,8 +6516,8 @@ /area/holodeck/source_meetinghall) "hIM" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/shotgunammo/large, -/obj/item/weapon/storage/box/stunshells/large, +/obj/item/ammo_magazine/ammo_box/b12g/pellet, +/obj/item/ammo_magazine/ammo_box/b12g/stunshell, /turf/unsimulated/floor{ icon_state = "steel" }, @@ -10156,10 +10156,10 @@ dir = 8 }, /obj/structure/window/reinforced, -/obj/item/weapon/storage/box/shotgunshells, -/obj/item/weapon/storage/box/shotgunshells, -/obj/item/weapon/storage/box/shotgunammo, -/obj/item/weapon/storage/box/shotgunammo, +/obj/item/ammo_magazine/ammo_box/b12g/pellet, +/obj/item/ammo_magazine/ammo_box/b12g/pellet, +/obj/item/ammo_magazine/ammo_box/b12g, +/obj/item/ammo_magazine/ammo_box/b12g, /turf/unsimulated/floor{ dir = 5; icon_state = "vault" @@ -11905,12 +11905,12 @@ /turf/simulated/shuttle/plating/airless/carry, /area/shuttle/transport1/centcom) "odr" = ( -/obj/item/weapon/storage/box/flashshells, -/obj/item/weapon/storage/box/flashshells, -/obj/item/weapon/storage/box/stunshells, -/obj/item/weapon/storage/box/stunshells, -/obj/item/weapon/storage/box/beanbags, -/obj/item/weapon/storage/box/beanbags, +/obj/item/ammo_magazine/ammo_box/b12g/flash, +/obj/item/ammo_magazine/ammo_box/b12g/flash, +/obj/item/ammo_magazine/ammo_box/b12g/stunshell, +/obj/item/ammo_magazine/ammo_box/b12g/stunshell, +/obj/item/ammo_magazine/ammo_box/b12g/beanbag, +/obj/item/ammo_magazine/ammo_box/b12g/beanbag, /obj/structure/window/reinforced, /obj/structure/table/rack, /obj/structure/window/reinforced{ diff --git a/maps/submaps/surface_submaps/wilderness/deathden.dmm b/maps/submaps/surface_submaps/wilderness/deathden.dmm index e6bf1f02bf..f3a65f96de 100644 --- a/maps/submaps/surface_submaps/wilderness/deathden.dmm +++ b/maps/submaps/surface_submaps/wilderness/deathden.dmm @@ -68,15 +68,9 @@ "wv" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_x = 6; pixel_y = 4},/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_y = -8},/obj/random/maintenance/engineering,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) "wG" = (/obj/structure/table/fancyblack,/obj/item/weapon/deadringer,/obj/item/weapon/reagent_containers/food/snacks/bearstew,/obj/effect/floor_decal/carpet,/obj/effect/floor_decal/carpet{dir = 4},/obj/effect/floor_decal/carpet{dir = 6},/turf/simulated/floor/carpet/turcarpet,/area/submap/DeathDen) "wK" = (/obj/structure/window/reinforced/tinted/frosted{dir = 1},/obj/structure/table/wooden_reinforced,/obj/random/soap,/obj/item/weapon/flame/candle/everburn,/turf/simulated/floor/tiled/freezer,/area/submap/DeathDen) -<<<<<<< HEAD "xN" = (/obj/item/weapon/material/shard/plastitaniumglass,/obj/item/weapon/material/shard/plastitaniumglass{pixel_x = 7; pixel_y = 8},/obj/item/weapon/reagent_containers/food/snacks/candy_corn,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) "xS" = (/turf/simulated/floor/carpet/turcarpet,/area/submap/DeathDen) -"xZ" = (/obj/item/weapon/storage/box/shotgunammo/large,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) -======= -"xN" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/DeathDen) -"xS" = (/mob/living/simple_mob/animal/sif/savik{health = 200; melee_damage_lower = 20; melee_damage_upper = 40; name = "alpha savik"},/turf/simulated/floor/carpet/turcarpet,/area/submap/DeathDen) "xZ" = (/obj/item/ammo_magazine/ammo_box/b12g/pellet,/obj/item/ammo_magazine/ammo_box/b12g/pellet,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) ->>>>>>> 27b451a2c81... Merge pull request #12353 from GhostActual/Ammo_Boxes "yn" = (/turf/simulated/floor/outdoors/dirt,/area/template_noop) "yL" = (/obj/structure/table/wooden_reinforced,/obj/item/weapon/flame/candle/everburn,/turf/simulated/floor/wood/sif,/area/submap/DeathDen) "yS" = (/obj/item/weapon/reagent_containers/food/snacks/candy_corn{pixel_x = 6; pixel_y = 4},/obj/effect/floor_decal/carpet{dir = 8},/obj/random/maintenance/engineering,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/turcarpet,/area/submap/DeathDen)