From 87e3c91a3218b22ad90693c0c75bf16ddc252892 Mon Sep 17 00:00:00 2001 From: Julien Date: Mon, 2 Oct 2023 12:31:56 +0200 Subject: [PATCH 01/23] adding subtype to guncabinet red and blue more power to the coder --- .../secure/{ => guncabinet}/guncabinet.dm | 4 - .../closets/secure/guncabinet/level_blue.dm | 36 ++++++ .../closets/secure/guncabinet/level_red.dm | 108 ++++++++++++++++++ colonialmarines.dme | 3 + 4 files changed, 147 insertions(+), 4 deletions(-) rename code/game/objects/structures/crates_lockers/closets/secure/{ => guncabinet}/guncabinet.dm (97%) create mode 100644 code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_blue.dm create mode 100644 code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/guncabinet.dm similarity index 97% rename from code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm rename to code/game/objects/structures/crates_lockers/closets/secure/guncabinet/guncabinet.dm index db20a738c8ed..316baebdd050 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/guncabinet.dm @@ -116,10 +116,6 @@ name = "green level gun cabinet" req_level = SEC_LEVEL_GREEN -/obj/structure/closet/secure_closet/guncabinet/blue - name = "blue level gun cabinet" - req_level = SEC_LEVEL_BLUE - /obj/structure/closet/secure_closet/guncabinet/red name = "red level gun cabinet" req_level = SEC_LEVEL_RED diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_blue.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_blue.dm new file mode 100644 index 000000000000..9462d5b28a42 --- /dev/null +++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_blue.dm @@ -0,0 +1,36 @@ +/obj/structure/closet/secure_closet/guncabinet/blue + name = "blue level gun cabinet" + req_level = SEC_LEVEL_BLUE + +//riot gear control cabinet adding vehicle clamp to it to... +// make more sense than in red alert cabinet. + +/obj/structure/closet/secure_closet/guncabinet/blue/riot_control + name = "riot control equipment closet" + storage_capacity = 55 //lots of stuff to fit in + req_level = SEC_LEVEL_BLUE + +/obj/structure/closet/secure_closet/guncabinet/blue/riot_control/Initialize() + . = ..() + new /obj/item/weapon/gun/shotgun/combat/riot(src, TRUE) + new /obj/item/weapon/gun/shotgun/combat/riot(src, TRUE) + new /obj/item/weapon/gun/shotgun/combat/riot(src, TRUE) + new /obj/item/weapon/shield/riot(src) + new /obj/item/weapon/shield/riot(src) + new /obj/item/weapon/shield/riot(src) + new /obj/item/ammo_magazine/shotgun/beanbag/riot(src) + new /obj/item/ammo_magazine/shotgun/beanbag/riot(src) + new /obj/item/ammo_magazine/shotgun/beanbag/riot(src) + new /obj/item/ammo_magazine/shotgun/beanbag/riot(src) + new /obj/item/weapon/gun/launcher/grenade/m81/riot(src, TRUE) + new /obj/item/storage/box/nade_box/tear_gas(src) + new /obj/item/clothing/mask/gas(src) + new /obj/item/clothing/mask/gas(src) + new /obj/item/clothing/mask/gas(src) + new /obj/item/clothing/head/helmet/riot(src) + new /obj/item/clothing/head/helmet/riot(src) + new /obj/item/clothing/head/helmet/riot(src) + new /obj/item/clothing/suit/armor/riot/marine(src) + new /obj/item/clothing/suit/armor/riot/marine(src) + new /obj/item/clothing/suit/armor/riot/marine(src) + new /obj/item/storage/box/flashbangs(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm new file mode 100644 index 000000000000..4211844bab08 --- /dev/null +++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm @@ -0,0 +1,108 @@ +/obj/structure/closet/secure_closet/guncabinet/red + name = "red level gun cabinet" + req_level = SEC_LEVEL_RED + +// MP ARMORY + +// 3 shotgun cabinet are in brig armory +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun + +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun/Initialize() + . = ..() + new /obj/item/weapon/gun/shotgun/combat(src) + new /obj/item/weapon/gun/shotgun/combat(src) + new /obj/item/weapon/gun/shotgun/combat(src) + new /obj/item/ammo_box/magazine/shotgun/buckshot(src) + new /obj/item/ammo_box/magazine/shotgun(src) + +// 2 M39 cabinet are in brig armory (4 M39 and 12 mags) +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun + +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun/Initialize() + . = ..() + new /obj/item/weapon/gun/smg/m39(src) + new /obj/item/weapon/gun/smg/m39(src) + new /obj/item/weapon/gun/smg/m39(src) + new /obj/item/weapon/gun/smg/m39(src) + new /obj/item/ammo_box/magazine/m39(src) + +// 2 m4ra cabinet are in brig armory (m4ra guns and 12 mags) +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle + +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle/Initialize() + . = ..() + new /obj/item/weapon/gun/rifle/m4ra(src) + new /obj/item/weapon/gun/rifle/m4ra(src) + new /obj/item/weapon/gun/rifle/m4ra(src) + new /obj/item/weapon/gun/rifle/m4ra(src) + new /obj/item/ammo_box/magazine/m4ra(src) + +// EXECUTION CHAMBER might add that here need to ask first... will reskin if asked. + + + + + +// CIC ARMORY + +// 4 shotgun cabinet are in cic armory +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_shotgun + +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_shotgun/Initialize() + . = ..() + new /obj/item/weapon/gun/shotgun/combat(src) + new /obj/item/ammo_magazine/shotgun/slugs(src) + new /obj/item/ammo_magazine/shotgun/buckshot(src) + +//4 MK1 cabinet(using guncase because it fit well here it seem) +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle + +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle/Initialize() + . = ..() + new /obj/item/storage/box/guncase/m41aMK1(src) + + +// UPPER MEDBAY ARMORY + +//1 shotgun armory closet 2 guns and 4 mags +/obj/structure/closet/secure_closet/guncabinet/red/medical_armory_shotgun + +/obj/structure/closet/secure_closet/guncabinet/red/medical_armory_shotgun/Initialize() + . = ..() + new /obj/item/weapon/gun/shotgun/combat(src) + new /obj/item/weapon/gun/shotgun/combat(src) + new /obj/item/ammo_magazine/shotgun/slugs(src) + new /obj/item/ammo_magazine/shotgun/slugs(src) + new /obj/item/ammo_magazine/shotgun/buckshot(src) + new /obj/item/ammo_magazine/shotgun/buckshot(src) + +// 2 pistol amory closet maybe to replace with full pistol belt... +/obj/structure/closet/secure_closet/guncabinet/red/medical_armory_m4a3_pistol + +/obj/structure/closet/secure_closet/guncabinet/red/medical_armory_m4a3_pistol/Initialize() + . = ..() + new /obj/item/weapon/gun/pistol/m4a3(src) + new /obj/item/weapon/gun/pistol/m4a3(src) + new /obj/item/weapon/gun/pistol/m4a3(src) + new /obj/item/weapon/gun/pistol/m4a3(src) + new /obj/item/ammo_box/magazine/m4a3(src) + +// 2 M39 cabinet are in medical armory (4 M39 and 12 mags) +/obj/structure/closet/secure_closet/guncabinet/red/medical_armory_m39_submachinegun + +/obj/structure/closet/secure_closet/guncabinet/red/medical_armory_m39/Initialize() + . = ..() + new /obj/item/weapon/gun/smg/m39(src) + new /obj/item/weapon/gun/smg/m39(src) + new /obj/item/weapon/gun/smg/m39(src) + new /obj/item/weapon/gun/smg/m39(src) + new /obj/item/ammo_box/magazine/m39(src) + +// UPPER ENGI ARMORY +// same as medical + +// REQ ARMORY +// same as medical + +// Small office in hangar armory same as brig armory.... +// same as brig armory diff --git a/colonialmarines.dme b/colonialmarines.dme index 3f40c156d075..ae54cee07eb9 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -1255,6 +1255,9 @@ s// DM Environment file for colonialmarines.dme. #include "code\game\objects\structures\crates_lockers\closets\secure\scientist.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\secure_closets.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\security.dm" +#include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet\guncabinet.dm" +#include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet\level_blue.dm" +#include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet\level_red.dm" #include "code\game\objects\structures\pipes\binary_misc.dm" #include "code\game\objects\structures\pipes\pipes.dm" #include "code\game\objects\structures\pipes\trinary_misc.dm" From 7bce9f88d2ff0bc56c77ba2f1f07d1f3034a979b Mon Sep 17 00:00:00 2001 From: Julien Date: Mon, 2 Oct 2023 12:46:16 +0200 Subject: [PATCH 02/23] move from medical armory to just armory so it's used around the ship. --- .../closets/secure/guncabinet/level_red.dm | 15 +- maps/map_files/USS_Almayer/USS_Almayer.dmm | 133 ++---------------- 2 files changed, 20 insertions(+), 128 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm index 4211844bab08..ac38051c5f43 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm @@ -41,8 +41,6 @@ - - // CIC ARMORY // 4 shotgun cabinet are in cic armory @@ -61,13 +59,12 @@ . = ..() new /obj/item/storage/box/guncase/m41aMK1(src) - // UPPER MEDBAY ARMORY //1 shotgun armory closet 2 guns and 4 mags -/obj/structure/closet/secure_closet/guncabinet/red/medical_armory_shotgun +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun -/obj/structure/closet/secure_closet/guncabinet/red/medical_armory_shotgun/Initialize() +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun/Initialize() . = ..() new /obj/item/weapon/gun/shotgun/combat(src) new /obj/item/weapon/gun/shotgun/combat(src) @@ -77,9 +74,9 @@ new /obj/item/ammo_magazine/shotgun/buckshot(src) // 2 pistol amory closet maybe to replace with full pistol belt... -/obj/structure/closet/secure_closet/guncabinet/red/medical_armory_m4a3_pistol +/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol -/obj/structure/closet/secure_closet/guncabinet/red/medical_armory_m4a3_pistol/Initialize() +/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol/Initialize() . = ..() new /obj/item/weapon/gun/pistol/m4a3(src) new /obj/item/weapon/gun/pistol/m4a3(src) @@ -88,9 +85,9 @@ new /obj/item/ammo_box/magazine/m4a3(src) // 2 M39 cabinet are in medical armory (4 M39 and 12 mags) -/obj/structure/closet/secure_closet/guncabinet/red/medical_armory_m39_submachinegun +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun -/obj/structure/closet/secure_closet/guncabinet/red/medical_armory_m39/Initialize() +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39/Initialize() . = ..() new /obj/item/weapon/gun/smg/m39(src) new /obj/item/weapon/gun/smg/m39(src) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 32937d821d60..7f20a8956705 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -3946,19 +3946,6 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_s) "anp" = ( -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/structure/closet/secure_closet/guncabinet/red, /obj/structure/sign/safety/hazard{ pixel_x = 15; pixel_y = 32 @@ -6077,10 +6064,7 @@ /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) "atx" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/ammo_magazine/shotgun/buckshot, +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_shotgun, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -6691,10 +6675,7 @@ /turf/open/floor/plating, /area/almayer/command/cic) "auR" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/ammo_magazine/rifle/m41aMK1/ap, -/obj/item/ammo_magazine/rifle/m41aMK1/ap, -/obj/item/weapon/gun/rifle/m41aMK1/ap, +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -35305,16 +35286,6 @@ }, /area/almayer/shipboard/starboard_missiles) "frJ" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, /obj/effect/decal/warning_stripes{ icon_state = "S" }, @@ -35325,6 +35296,7 @@ /obj/structure/sign/safety/hazard{ pixel_y = 32 }, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, /turf/open/floor/plating/almayer, /area/almayer/shipboard/brig/armory) "frM" = ( @@ -46968,16 +46940,7 @@ icon_state = "N"; pixel_y = 2 }, -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/weapon/gun/rifle/m4ra, -/obj/item/weapon/gun/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -48141,25 +48104,16 @@ }, /area/almayer/hallways/aft_hallway) "kTc" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, /obj/structure/machinery/light/small{ dir = 8 }, -/obj/item/weapon/gun/shotgun/combat, /obj/item/vehicle_clamp, /obj/item/vehicle_clamp, /obj/item/vehicle_clamp, /obj/effect/decal/warning_stripes{ icon_state = "S" }, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, /turf/open/floor/plating/almayer, /area/almayer/shipboard/brig/armory) "kTq" = ( @@ -51737,11 +51691,8 @@ /turf/open/floor/almayer, /area/almayer/living/port_emb) "mtX" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/ammo_magazine/rifle/m41aMK1/ap, -/obj/item/ammo_magazine/rifle/m41aMK1/ap, -/obj/item/weapon/gun/rifle/m41aMK1/ap, /obj/structure/machinery/light, +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -51981,13 +51932,10 @@ /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) "mAr" = ( -/obj/structure/closet/secure_closet/guncabinet/riot_control, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, /obj/effect/decal/warning_stripes{ icon_state = "S" }, +/obj/structure/closet/secure_closet/guncabinet/blue/riot_control, /turf/open/floor/plating/almayer, /area/almayer/shipboard/brig/armory) "mAT" = ( @@ -56106,19 +56054,10 @@ /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/cells) "omu" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, /obj/effect/decal/warning_stripes{ icon_state = "S" }, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, /turf/open/floor/plating/almayer, /area/almayer/shipboard/brig/armory) "omy" = ( @@ -65511,13 +65450,10 @@ }, /area/almayer/engineering/upper_engineering/starboard) "ssW" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/weapon/gun/shotgun/combat, /obj/structure/machinery/light{ dir = 1 }, -/obj/item/ammo_magazine/shotgun/buckshot, +/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_shotgun, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -66424,19 +66360,6 @@ /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) "sOZ" = ( -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/structure/closet/secure_closet/guncabinet/red, /obj/structure/sign/safety/ammunition{ pixel_y = 32 }, @@ -66845,20 +66768,11 @@ }, /area/almayer/lifeboat_pumps/south2) "sYB" = ( -/obj/structure/closet/secure_closet/guncabinet/red, /obj/effect/decal/warning_stripes{ icon_state = "N"; pixel_y = 2 }, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun, /turf/open/floor/plating/almayer, /area/almayer/shipboard/brig/armory) "sYC" = ( @@ -71842,16 +71756,13 @@ /turf/open/floor/plating, /area/almayer/hallways/repair_bay) "uZY" = ( -/obj/structure/closet/secure_closet/guncabinet/riot_control, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, /obj/effect/decal/warning_stripes{ icon_state = "S" }, /obj/structure/machinery/light/small{ dir = 1 }, +/obj/structure/closet/secure_closet/guncabinet/blue/riot_control, /turf/open/floor/plating/almayer, /area/almayer/shipboard/brig/armory) "uZZ" = ( @@ -72811,16 +72722,13 @@ }, /area/almayer/hallways/hangar) "vsI" = ( -/obj/structure/closet/secure_closet/guncabinet/riot_control, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, /obj/effect/decal/warning_stripes{ icon_state = "S" }, /obj/structure/machinery/camera/autoname/almayer{ name = "ship-grade camera" }, +/obj/structure/closet/secure_closet/guncabinet/blue/riot_control, /turf/open/floor/plating/almayer, /area/almayer/shipboard/brig/armory) "vsJ" = ( @@ -76670,7 +76578,6 @@ /turf/closed/wall/almayer/outer, /area/almayer/hull/lower_hull/l_a_s) "wVw" = ( -/obj/structure/closet/secure_closet/guncabinet/red, /obj/structure/machinery/light/small{ dir = 8 }, @@ -76681,11 +76588,7 @@ icon_state = "N"; pixel_y = 2 }, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun, /turf/open/floor/plating/almayer, /area/almayer/shipboard/brig/armory) "wVy" = ( @@ -77635,18 +77538,10 @@ icon_state = "N"; pixel_y = 2 }, -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/weapon/gun/rifle/m4ra, -/obj/item/weapon/gun/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, -/obj/item/ammo_magazine/rifle/m4ra, /obj/structure/reagent_dispensers/peppertank{ pixel_y = -30 }, +/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" From 0a5f69ea4a6d595cc0b2b05a8eb66c61c4b59b93 Mon Sep 17 00:00:00 2001 From: Julien Date: Mon, 2 Oct 2023 12:55:21 +0200 Subject: [PATCH 03/23] fix stuff around and change map. --- .../closets/secure/guncabinet/level_red.dm | 2 +- maps/map_files/USS_Almayer/USS_Almayer.dmm | 115 +++--------------- 2 files changed, 17 insertions(+), 100 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm index ac38051c5f43..4d7f8a78f9bb 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm @@ -87,7 +87,7 @@ // 2 M39 cabinet are in medical armory (4 M39 and 12 mags) /obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun -/obj/structure/closet/secure_closet/guncabinet/red/armory_m39/Initialize() +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun/Initialize() . = ..() new /obj/item/weapon/gun/smg/m39(src) new /obj/item/weapon/gun/smg/m39(src) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 7f20a8956705..3ba618b1ecfb 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -3715,10 +3715,10 @@ }, /area/almayer/hallways/aft_hallway) "amE" = ( -/obj/structure/closet/secure_closet/guncabinet/red, /obj/item/clothing/suit/storage/marine/light/vest, /obj/item/clothing/suit/storage/marine/light/vest, /obj/item/clothing/suit/storage/marine/light/vest, +/obj/structure/surface/rack, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -3950,6 +3950,7 @@ pixel_x = 15; pixel_y = 32 }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -3960,31 +3961,23 @@ name = "General Listening Channel"; pixel_y = 28 }, -/obj/structure/closet/secure_closet/guncabinet/red, /obj/item/clothing/suit/storage/marine/light/vest, /obj/item/clothing/suit/storage/marine/light/vest, /obj/item/clothing/suit/storage/marine/light/vest, /obj/item/clothing/suit/storage/marine/light/vest, /obj/item/clothing/suit/storage/marine/light/vest, /obj/item/clothing/suit/storage/marine/light/vest, +/obj/structure/surface/rack, /turf/open/floor/almayer{ icon_state = "redfull" }, /area/almayer/medical/upper_medical) "anr" = ( -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/structure/closet/secure_closet/guncabinet/red, /obj/structure/sign/safety/intercom{ pixel_x = 8; pixel_y = 32 }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -5625,17 +5618,11 @@ /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) "asu" = ( -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, -/obj/structure/closet/secure_closet/guncabinet/red, /obj/structure/sign/safety/hazard{ pixel_x = 32; pixel_y = -8 }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -8074,13 +8061,7 @@ }, /area/almayer/engineering/upper_engineering) "azp" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -10558,19 +10539,7 @@ }, /area/almayer/engineering/upper_engineering) "aIV" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -23778,13 +23747,6 @@ }, /area/almayer/squads/charlie_delta_shared) "bUo" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, /obj/structure/sign/safety/ammunition{ pixel_x = 15; pixel_y = -32 @@ -23792,6 +23754,7 @@ /obj/structure/sign/safety/hazard{ pixel_y = -32 }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -37352,11 +37315,7 @@ }, /area/almayer/hull/lower_hull/l_a_s) "gka" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -39210,17 +39169,11 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_hallway) "hbI" = ( -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, -/obj/structure/closet/secure_closet/guncabinet/red, /obj/structure/sign/safety/ammunition{ pixel_x = 32; pixel_y = 7 }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -54454,12 +54407,6 @@ }, /area/almayer/command/lifeboat) "nDd" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, /obj/structure/sign/safety/ammunition{ pixel_x = 15; pixel_y = 32 @@ -54467,8 +54414,7 @@ /obj/structure/sign/safety/hazard{ pixel_y = 32 }, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -57307,7 +57253,7 @@ "oNf" = ( /obj/item/stack/folding_barricade/three, /obj/item/stack/folding_barricade/three, -/obj/structure/closet/secure_closet/guncabinet/red, +/obj/structure/surface/rack, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -59704,19 +59650,7 @@ }, /area/almayer/hull/lower_hull/l_f_p) "pVx" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/weapon/gun/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, -/obj/item/ammo_magazine/smg/m39, +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -60758,22 +60692,10 @@ /turf/open/floor/wood/ship, /area/almayer/living/basketball) "qqr" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/weapon/gun/pistol/m4a3, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, /obj/structure/machinery/light{ dir = 8 }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -61521,16 +61443,10 @@ }, /area/almayer/medical/medical_science) "qJf" = ( -/obj/structure/closet/secure_closet/guncabinet/red, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/weapon/gun/shotgun/combat, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot, /obj/structure/machinery/light{ dir = 4 }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -66363,6 +66279,7 @@ /obj/structure/sign/safety/ammunition{ pixel_y = 32 }, +/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol, /turf/open/floor/almayer{ icon_state = "redfull" }, From 8c817f83762938959067bbbbadd8e2a60e13065a Mon Sep 17 00:00:00 2001 From: Julien Date: Mon, 2 Oct 2023 12:57:57 +0200 Subject: [PATCH 04/23] adding vehicle clamp to the riot control closet --- .../crates_lockers/closets/secure/guncabinet/level_blue.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_blue.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_blue.dm index 9462d5b28a42..acc43c302e6d 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_blue.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_blue.dm @@ -34,3 +34,4 @@ new /obj/item/clothing/suit/armor/riot/marine(src) new /obj/item/clothing/suit/armor/riot/marine(src) new /obj/item/storage/box/flashbangs(src) + new /obj/item/vehicle_clamp(src) From 355d47cd6113c8f3851ef185abf5601f6ddcafbe Mon Sep 17 00:00:00 2001 From: Julien Date: Mon, 2 Oct 2023 12:59:23 +0200 Subject: [PATCH 05/23] remove clamp on the map. --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 3ba618b1ecfb..60d7d07def8e 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -48060,9 +48060,6 @@ /obj/structure/machinery/light/small{ dir = 8 }, -/obj/item/vehicle_clamp, -/obj/item/vehicle_clamp, -/obj/item/vehicle_clamp, /obj/effect/decal/warning_stripes{ icon_state = "S" }, @@ -76498,9 +76495,6 @@ /obj/structure/machinery/light/small{ dir = 8 }, -/obj/item/vehicle_clamp, -/obj/item/vehicle_clamp, -/obj/item/vehicle_clamp, /obj/effect/decal/warning_stripes{ icon_state = "N"; pixel_y = 2 From 52541bcfdd4dd8ef847c5e710d2e2b23b34392c4 Mon Sep 17 00:00:00 2001 From: Julien Date: Mon, 2 Oct 2023 13:02:39 +0200 Subject: [PATCH 06/23] removed unused mp_armory preset for closet. --- .../closets/secure/guncabinet/guncabinet.dm | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/guncabinet.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/guncabinet.dm index 316baebdd050..4531a68c42dd 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/guncabinet.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/guncabinet.dm @@ -65,21 +65,7 @@ contents_explosion(severity - EXPLOSION_THRESHOLD_LOW) deconstruct(FALSE) -/obj/structure/closet/secure_closet/guncabinet/mp_armory -// req_access = list(ACCESS_MARINE_BRIG) - req_level = SEC_LEVEL_RED - -/obj/structure/closet/secure_closet/guncabinet/mp_armory/Initialize() - . = ..() - new /obj/item/weapon/gun/shotgun/combat(src) - new /obj/item/weapon/gun/shotgun/combat(src) - new /obj/item/ammo_magazine/shotgun/slugs(src) - new /obj/item/ammo_magazine/shotgun/buckshot(src) - new /obj/item/ammo_magazine/shotgun/buckshot(src) - new /obj/item/ammo_magazine/shotgun/buckshot(src) - - - +//this is used on corsat.(leaving it as a prop i guess) /obj/structure/closet/secure_closet/guncabinet/riot_control name = "riot control equipment closet" // req_access = list(ACCESS_MARINE_BRIG) @@ -111,7 +97,6 @@ new /obj/item/clothing/suit/armor/riot/marine(src) new /obj/item/storage/box/flashbangs(src) - /obj/structure/closet/secure_closet/guncabinet/green name = "green level gun cabinet" req_level = SEC_LEVEL_GREEN From 9aa6e55c0d572c6845fd9e4d62799322e8e18155 Mon Sep 17 00:00:00 2001 From: Julien Date: Mon, 2 Oct 2023 13:12:07 +0200 Subject: [PATCH 07/23] don't understand dme logic let's try this... --- colonialmarines.dme | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/colonialmarines.dme b/colonialmarines.dme index ae54cee07eb9..55374bb4e4b3 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -1243,6 +1243,9 @@ s// DM Environment file for colonialmarines.dme. #include "code\game\objects\structures\crates_lockers\closets\utility_closets.dm" #include "code\game\objects\structures\crates_lockers\closets\wall_locker.dm" #include "code\game\objects\structures\crates_lockers\closets\wardrobe.dm" +#include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet\guncabinet.dm" +#include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet\level_blue.dm" +#include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet\level_red.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\bar.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\cargo.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\cm_closets.dm" @@ -1255,9 +1258,6 @@ s// DM Environment file for colonialmarines.dme. #include "code\game\objects\structures\crates_lockers\closets\secure\scientist.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\secure_closets.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\security.dm" -#include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet\guncabinet.dm" -#include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet\level_blue.dm" -#include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet\level_red.dm" #include "code\game\objects\structures\pipes\binary_misc.dm" #include "code\game\objects\structures\pipes\pipes.dm" #include "code\game\objects\structures\pipes\trinary_misc.dm" From e898023ac33cd56e92880eaa2a9d6084125ae2df Mon Sep 17 00:00:00 2001 From: Julien Date: Mon, 2 Oct 2023 13:23:51 +0200 Subject: [PATCH 08/23] cgabgeubg dle vecayse styf weurad --- colonialmarines.dme | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/colonialmarines.dme b/colonialmarines.dme index 55374bb4e4b3..ae54cee07eb9 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -1243,9 +1243,6 @@ s// DM Environment file for colonialmarines.dme. #include "code\game\objects\structures\crates_lockers\closets\utility_closets.dm" #include "code\game\objects\structures\crates_lockers\closets\wall_locker.dm" #include "code\game\objects\structures\crates_lockers\closets\wardrobe.dm" -#include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet\guncabinet.dm" -#include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet\level_blue.dm" -#include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet\level_red.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\bar.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\cargo.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\cm_closets.dm" @@ -1258,6 +1255,9 @@ s// DM Environment file for colonialmarines.dme. #include "code\game\objects\structures\crates_lockers\closets\secure\scientist.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\secure_closets.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\security.dm" +#include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet\guncabinet.dm" +#include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet\level_blue.dm" +#include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet\level_red.dm" #include "code\game\objects\structures\pipes\binary_misc.dm" #include "code\game\objects\structures\pipes\pipes.dm" #include "code\game\objects\structures\pipes\trinary_misc.dm" From 6a6bc5cfe3ee37df08b9f4f057481f6091f10cb2 Mon Sep 17 00:00:00 2001 From: Julien Date: Mon, 2 Oct 2023 13:38:17 +0200 Subject: [PATCH 09/23] remove dm file in dme because i remove the file dumb meeeeeeeeeeeeeeeee --- colonialmarines.dme | 1 - 1 file changed, 1 deletion(-) diff --git a/colonialmarines.dme b/colonialmarines.dme index ae54cee07eb9..0633cb3df868 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -1248,7 +1248,6 @@ s// DM Environment file for colonialmarines.dme. #include "code\game\objects\structures\crates_lockers\closets\secure\cm_closets.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\engineering.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\freezer.dm" -#include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\hydroponics.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\medical.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\personal.dm" From 97363d37977e27a147daf74e92320634dd9a25f5 Mon Sep 17 00:00:00 2001 From: Julien Date: Tue, 3 Oct 2023 14:14:44 +0200 Subject: [PATCH 10/23] making a subtype for CL and CO safe make a subtype for the special coin in CO safe. --- code/game/objects/items/devices/coins.dm | 5 +++++ code/game/objects/structures/safe.dm | 25 ++++++++++++++++++++++ maps/map_files/USS_Almayer/USS_Almayer.dmm | 20 ++--------------- 3 files changed, 32 insertions(+), 18 deletions(-) diff --git a/code/game/objects/items/devices/coins.dm b/code/game/objects/items/devices/coins.dm index 6ab79e3216d4..28f773247c04 100644 --- a/code/game/objects/items/devices/coins.dm +++ b/code/game/objects/items/devices/coins.dm @@ -29,6 +29,11 @@ icon_state = "coin_silver" black_market_value = 25 +//CO coin +/obj/item/coin/silver/falcon + name = "falling falcons challenge coin" + desc = "A small coin, bearing the falling falcons insignia." + /obj/item/coin/copper name = "copper coin" desc = "A familiar, but cheap form of currency." diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index 87e713ad0af8..011fa2a17f48 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -222,3 +222,28 @@ FLOOR SAFES /obj/structure/safe/floor/hide(intact) invisibility = intact ? 101 : 0 + +//almayer + +/obj/structure/safe/co_office + +/obj/structure/safe/co_office/Initialize() + . = ..() + new /obj/item/clothing/glasses/monocle(src) + new /obj/item/book/codebook(src) + new /obj/item/coin/silver/falcon(src) + new /obj/item/weapon/telebaton(src) + new /obj/item/moneybag(src) + +/obj/structure/safe/cl_office + +/obj/structure/safe/cl_office/Initialize() + . = ..() + new /obj/item/clothing/suit/armor/bulletproof(src) + new /obj/item/weapon/gun/pistol/es4(src) + new /obj/item/ammo_magazine/pistol/es4(src) + new /obj/item/ammo_magazine/pistol/es4(src) + new /obj/item/clothing/accessory/storage/holster(src) + new /obj/item/spacecash/c1000/counterfeit(src) + new /obj/item/spacecash/c1000/counterfeit(src) + new /obj/item/coin/platinum(src) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 60d7d07def8e..5d8c67b733be 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -1641,15 +1641,7 @@ }, /area/space) "afo" = ( -/obj/structure/safe, -/obj/item/moneybag, -/obj/item/clothing/glasses/monocle, -/obj/item/weapon/telebaton, -/obj/item/book/codebook, -/obj/item/coin/silver{ - desc = "A small coin, bearing the falling falcons insignia."; - name = "falling falcons challenge coin" - }, +/obj/structure/safe/co_office, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) "afq" = ( @@ -15640,15 +15632,7 @@ }, /area/almayer/living/bridgebunks) "bhM" = ( -/obj/structure/safe, -/obj/item/coin/platinum, -/obj/item/spacecash/c1000/counterfeit, -/obj/item/spacecash/c1000/counterfeit, -/obj/item/clothing/accessory/storage/holster, -/obj/item/weapon/gun/pistol/es4, -/obj/item/ammo_magazine/pistol/es4, -/obj/item/ammo_magazine/pistol/es4, -/obj/item/clothing/suit/armor/bulletproof, +/obj/structure/safe/cl_office, /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) "bhT" = ( From 0d221d490aee3919f8fa6c20b0361078ef63c7e3 Mon Sep 17 00:00:00 2001 From: Julien Date: Tue, 3 Oct 2023 14:19:05 +0200 Subject: [PATCH 11/23] adding the honorguard kit inside the special closet. --- .../structures/crates_lockers/closets/secure/cm_closets.dm | 2 ++ maps/map_files/USS_Almayer/USS_Almayer.dmm | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm index ffd993777644..1edac3a8f324 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm @@ -32,6 +32,8 @@ GLOBAL_LIST_EMPTY(co_secure_boxes) /obj/structure/closet/secure_closet/securecom/Initialize() . = ..() + new /obj/item/storage/box/kit/honorguard(src) + new /obj/item/storage/box/kit/honorguard(src) GLOB.co_secure_boxes += src /obj/structure/closet/secure_closet/securecom/Destroy() diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 5d8c67b733be..233d2cc0484e 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -2748,8 +2748,6 @@ /area/almayer/medical/upper_medical) "ajm" = ( /obj/structure/closet/secure_closet/securecom, -/obj/item/storage/box/kit/honorguard, -/obj/item/storage/box/kit/honorguard, /turf/open/floor/almayer{ icon_state = "redfull" }, From 75b3458ec9e4bc824a4f7d2d582ddc165403a64b Mon Sep 17 00:00:00 2001 From: Julien Date: Tue, 3 Oct 2023 16:49:04 +0200 Subject: [PATCH 12/23] adding stock meat and fish subtype. --- code/game/objects/items/storage/boxes.dm | 17 ++++++++++ .../crates_lockers/closets/secure/freezer.dm | 34 +++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 6266f0eef77d..f49937ffbd5e 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -760,3 +760,20 @@ else if(!isopened) isopened = 1 icon_state = "mealpackopened" + + +//food boxes for storage in bulk + +//meat +/obj/item/storage/box/meat + +/obj/item/storage/box/meat/fill_preset_inventory() + for(var/i = 0, i < 7, i++) + new /obj/item/reagent_container/food/snacks/meat/monkey(src) + +//fish +/obj/item/storage/box/fish + +/obj/item/storage/box/fish/fill_preset_inventory() + for(var/i = 0, i < 7, i++) + new /obj/item/reagent_container/food/snacks/carpmeat(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index 323ff50fd63b..765b56292704 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -157,3 +157,37 @@ containers++ if(containers > 3) break + +//almayer + +//meat surplus +/obj/structure/closet/secure_closet/freezer/meat_stock + name = "meat" + +/obj/structure/closet/secure_closet/freezer/meat_stock/Initialize() + . = ..() + for(var/i = 0, i < 2, i++) + new /obj/item/storage/box/meat(src) + +//fish surplus +/obj/structure/closet/secure_closet/freezer/fish_stock + name = "fish" + +/obj/structure/closet/secure_closet/freezer/fish_stock/Initialize() + . = ..() + for(var/i = 0, i < 2, i++) + new /obj/item/storage/box/fish(src) +/* +//plants +/obj/structure/closet/secure_closet/freezer/plants + name = "plants" + +/obj/structure/closet/secure_closet/freezer/plants/Initialize() + . = ..() +//groceries to hold milk etc... +/obj/structure/closet/secure_closet/freezer/groceries + name = "Groceries" + +/obj/structure/closet/secure_closet/freezer/groceries/Initialize() + . = ..() +*/ From cf03e54f54e37a7ac0495faaccb11a06660c67b1 Mon Sep 17 00:00:00 2001 From: Julien Date: Tue, 3 Oct 2023 16:53:14 +0200 Subject: [PATCH 13/23] add them to the map. --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 233d2cc0484e..e228a165d6d6 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -57167,7 +57167,7 @@ }, /area/almayer/medical/hydroponics) "oMd" = ( -/obj/structure/closet/secure_closet/freezer/meat, +/obj/structure/closet/secure_closet/freezer/fish_stock, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -72384,6 +72384,12 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north1) +"vmO" = ( +/obj/structure/closet/secure_closet/freezer/meat_stock, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/grunt_rnr) "vmW" = ( /turf/open/floor/almayer{ dir = 6; @@ -113142,7 +113148,7 @@ loY wXI nUd lkd -oMd +vmO bDs gSk oDE From 21b54a0b432d560b59501210fc890cc4d1c15aef Mon Sep 17 00:00:00 2001 From: Julien Date: Tue, 3 Oct 2023 17:06:08 +0200 Subject: [PATCH 14/23] adding big storage for milk soymilk egg box called groceries --- code/game/objects/items/storage/boxes.dm | 21 +++++++++++++++++++ .../crates_lockers/closets/secure/freezer.dm | 19 +++++++++-------- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index f49937ffbd5e..3c8ff8dd1631 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -777,3 +777,24 @@ /obj/item/storage/box/fish/fill_preset_inventory() for(var/i = 0, i < 7, i++) new /obj/item/reagent_container/food/snacks/carpmeat(src) + +//milk +/obj/item/storage/box/milk + +/obj/item/storage/box/milk/fill_preset_inventory() + for(var/i = 0, i < 7, i++) + new /obj/item/reagent_container/food/drinks/milk(src) + +//soymilk +/obj/item/storage/box/soymilk + +/obj/item/storage/box/soymilk/fill_preset_inventory() + for(var/i = 0, i < 7, i++) + new /obj/item/reagent_container/food/drinks/soymilk(src) + +//enzyme +/obj/item/storage/box/enzyme + +/obj/item/storage/box/enzyme/fill_preset_inventory() + for(var/i = 0, i < 7, i++) + new /obj/item/reagent_container/food/condiment/enzyme(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index 765b56292704..c53688eb29f8 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -158,7 +158,7 @@ if(containers > 3) break -//almayer +//almayer surplus storage //meat surplus /obj/structure/closet/secure_closet/freezer/meat_stock @@ -177,17 +177,18 @@ . = ..() for(var/i = 0, i < 2, i++) new /obj/item/storage/box/fish(src) -/* -//plants -/obj/structure/closet/secure_closet/freezer/plants - name = "plants" -/obj/structure/closet/secure_closet/freezer/plants/Initialize() - . = ..() -//groceries to hold milk etc... +//groceries to hold milk in bulk /obj/structure/closet/secure_closet/freezer/groceries name = "Groceries" /obj/structure/closet/secure_closet/freezer/groceries/Initialize() . = ..() -*/ + for(var/i = 0, i < 2, i++) + new /obj/item/storage/box/milk(src) + for(var/i = 0, i < 2, i++) + new /obj/item/reagent_container/food/drinks/soymilk(src) + for(var/i = 0, i < 7, i++) + new /obj/item/storage/fancy/egg_box(src) + for(var/i = 0, i < 2, i++) + /obj/item/storage/box/enzyme(src) From 298131718e8dc21cabcd48ab2b56886069858f16 Mon Sep 17 00:00:00 2001 From: Julien Date: Tue, 3 Oct 2023 17:21:44 +0200 Subject: [PATCH 15/23] making an only plants freezer and an only dry storage --- code/game/objects/items/storage/boxes.dm | 21 ++++++ .../crates_lockers/closets/secure/freezer.dm | 64 +++++++++++++++++++ 2 files changed, 85 insertions(+) diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 3c8ff8dd1631..2e70129e0da9 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -798,3 +798,24 @@ /obj/item/storage/box/enzyme/fill_preset_inventory() for(var/i = 0, i < 7, i++) new /obj/item/reagent_container/food/condiment/enzyme(src) + +//flour +/obj/item/storage/box/flour + +/obj/item/storage/box/flour/fill_preset_inventory() + for(var/i = 0, i < 7, i++) + new /obj/item/reagent_container/food/snacks/flour(src) + +//sugar +/obj/item/storage/box/sugar + +/obj/item/storage/box/sugar/fill_preset_inventory() + for(var/i = 0, i < 7, i++) + new /obj/item/reagent_container/food/condiment/sugar(src) + +//potato +/obj/item/storage/box/potato + +/obj/item/storage/box/potato/fill_preset_inventory() + for(var/i = 0, i < 7, i++) + new /obj/item/reagent_container/food/snacks/grown/potato(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index c53688eb29f8..9fde9140e562 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -192,3 +192,67 @@ new /obj/item/storage/fancy/egg_box(src) for(var/i = 0, i < 2, i++) /obj/item/storage/box/enzyme(src) + +//dry storage + +/obj/structure/closet/secure_closet/freezer/groceries + name = "Groceries" + +/obj/structure/closet/secure_closet/freezer/groceries/Initialize() + . = ..() + for(var/i = 0, i < 2, i++) + new /obj/item/storage/box/milk(src) + for(var/i = 0, i < 2, i++) + new /obj/item/reagent_container/food/drinks/soymilk(src) + for(var/i = 0, i < 7, i++) + new /obj/item/storage/fancy/egg_box(src) + for(var/i = 0, i < 2, i++) + /obj/item/storage/box/enzyme(src) + +//dry storage for dry food only... +/obj/structure/closet/secure_closet/freezer/dry + name = "dry" + +/obj/structure/closet/secure_closet/freezer/groceries/Initialize() + . = ..() + for(var/i = 0, i < 4, i++) + new /obj/item/storage/box/flour(src) + new /obj/item/storage/box/sugar(src) + +//plant only + +/obj/structure/closet/secure_closet/freezer/plants + name = "Plants" + +/obj/structure/closet/secure_closet/freezer/plants/Initialize() + . = ..() + for(var/i = 0, i < 2, i++) + new /obj/item/reagent_container/food/snacks/grown/apple(src) + for(var/i = 0, i < 2, i++) + new /obj/item/reagent_container/food/snacks/grown/cabbage(src) + for(var/i = 0, i < 2, i++) + new /obj/item/reagent_container/food/snacks/grown/carrot(src) + for(var/i = 0, i < 2, i++) + new /obj/item/reagent_container/food/snacks/grown/mushroom/chanterelle(src) + for(var/i = 0, i < 2, i++) + new /obj/item/reagent_container/food/snacks/grown/chili(src) + for(var/i = 0, i < 2, i++) + new /obj/item/reagent_container/food/snacks/grown/corn(src) + for(var/i = 0, i < 2, i++) + new /obj/item/reagent_container/food/snacks/grown/eggplant(src) + for(var/i = 0, i < 2, i++) + new /obj/item/reagent_container/food/snacks/grown/potato(src) + for(var/i = 0, i < 2, i++) + new /obj/item/reagent_container/food/snacks/grown/tomato(src) + for(var/i = 0, i < 2, i++) + new /obj/item/reagent_container/food/snacks/grown/whitebeet(src) + for(var/i = 0, i < 2, i++) + new /obj/item/reagent_container/food/snacks/grown/cherries(src) + for(var/i = 0, i < 2, i++) + new /obj/item/reagent_container/food/snacks/grown/lime(src) + for(var/i = 0, i < 2, i++) + new /obj/item/reagent_container/food/snacks/grown/lemon(src) + for(var/i = 0, i < 2, i++) + new /obj/item/reagent_container/food/snacks/grown/orange(src) + for(var/i = 0, i < 2, i++) + new /obj/item/reagent_container/food/snacks/grown/banana(src) From c7dcd4778c8e40cf41296b7e042a1839d4a2a1bc Mon Sep 17 00:00:00 2001 From: Julien Date: Tue, 3 Oct 2023 17:26:35 +0200 Subject: [PATCH 16/23] added to map --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index e228a165d6d6..09517e8acb13 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -30276,12 +30276,9 @@ }, /area/almayer/squads/req) "dpn" = ( -/obj/structure/closet/secure_closet/freezer/fridge/full, /obj/structure/machinery/light{ dir = 1 }, -/obj/item/reagent_container/food/condiment/enzyme, -/obj/item/reagent_container/food/condiment/enzyme, /obj/structure/transmitter{ name = "Kitchen Telephone"; phone_category = "Almayer"; @@ -30289,6 +30286,7 @@ pixel_x = -8; pixel_y = 29 }, +/obj/structure/closet/secure_closet/freezer/dry, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -34878,9 +34876,8 @@ }, /area/almayer/engineering/upper_engineering/starboard) "fhQ" = ( -/obj/structure/closet/secure_closet/freezer/fridge/full, /obj/structure/machinery/light, -/obj/item/reagent_container/food/condiment/sugar, +/obj/structure/closet/secure_closet/freezer/groceries, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -46826,10 +46823,10 @@ }, /area/almayer/squads/bravo) "ksA" = ( -/obj/structure/closet/secure_closet/freezer/fridge/groceries, /obj/structure/machinery/light{ dir = 8 }, +/obj/structure/closet/secure_closet/freezer/plants, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -57876,7 +57873,7 @@ }, /area/almayer/hull/lower_hull/l_f_p) "pdt" = ( -/obj/structure/closet/secure_closet/freezer/fridge/groceries, +/obj/structure/closet/secure_closet/freezer/plants, /turf/open/floor/almayer{ icon_state = "plate" }, From d0365ee90e81d28ab2b58f28fa11a56d03bbf4a0 Mon Sep 17 00:00:00 2001 From: Julien Date: Tue, 3 Oct 2023 17:34:12 +0200 Subject: [PATCH 17/23] fix --- .../crates_lockers/closets/secure/freezer.dm | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index 9fde9140e562..76533a96c50b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -191,29 +191,13 @@ for(var/i = 0, i < 7, i++) new /obj/item/storage/fancy/egg_box(src) for(var/i = 0, i < 2, i++) - /obj/item/storage/box/enzyme(src) - -//dry storage - -/obj/structure/closet/secure_closet/freezer/groceries - name = "Groceries" - -/obj/structure/closet/secure_closet/freezer/groceries/Initialize() - . = ..() - for(var/i = 0, i < 2, i++) - new /obj/item/storage/box/milk(src) - for(var/i = 0, i < 2, i++) - new /obj/item/reagent_container/food/drinks/soymilk(src) - for(var/i = 0, i < 7, i++) - new /obj/item/storage/fancy/egg_box(src) - for(var/i = 0, i < 2, i++) - /obj/item/storage/box/enzyme(src) + new /obj/item/storage/box/enzyme(src) //dry storage for dry food only... /obj/structure/closet/secure_closet/freezer/dry name = "dry" -/obj/structure/closet/secure_closet/freezer/groceries/Initialize() +/obj/structure/closet/secure_closet/freezer/dry/Initialize() . = ..() for(var/i = 0, i < 4, i++) new /obj/item/storage/box/flour(src) From e8d7c104aea3d799dd26f3641cb3d9d422ebc6b0 Mon Sep 17 00:00:00 2001 From: Julien Date: Tue, 3 Oct 2023 17:47:53 +0200 Subject: [PATCH 18/23] add name to box to be able to identify without opening --- code/game/objects/items/storage/boxes.dm | 8 ++++++++ .../structures/crates_lockers/closets/secure/freezer.dm | 5 ++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 2e70129e0da9..8e9b3c901872 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -766,6 +766,7 @@ //meat /obj/item/storage/box/meat + name = "\improper Meat Box" /obj/item/storage/box/meat/fill_preset_inventory() for(var/i = 0, i < 7, i++) @@ -773,6 +774,7 @@ //fish /obj/item/storage/box/fish + name = "\improper Fish Box" /obj/item/storage/box/fish/fill_preset_inventory() for(var/i = 0, i < 7, i++) @@ -780,6 +782,7 @@ //milk /obj/item/storage/box/milk + name = "\improper Milk Box" /obj/item/storage/box/milk/fill_preset_inventory() for(var/i = 0, i < 7, i++) @@ -787,6 +790,7 @@ //soymilk /obj/item/storage/box/soymilk + name = "\improper Soymilk Box" /obj/item/storage/box/soymilk/fill_preset_inventory() for(var/i = 0, i < 7, i++) @@ -794,6 +798,7 @@ //enzyme /obj/item/storage/box/enzyme + name = "\improper Enzyme Box" /obj/item/storage/box/enzyme/fill_preset_inventory() for(var/i = 0, i < 7, i++) @@ -801,6 +806,7 @@ //flour /obj/item/storage/box/flour + name = "\improper Flour Box" /obj/item/storage/box/flour/fill_preset_inventory() for(var/i = 0, i < 7, i++) @@ -808,6 +814,7 @@ //sugar /obj/item/storage/box/sugar + name = "\improper Sugar Box" /obj/item/storage/box/sugar/fill_preset_inventory() for(var/i = 0, i < 7, i++) @@ -815,6 +822,7 @@ //potato /obj/item/storage/box/potato + name = "\improper Potato Box" /obj/item/storage/box/potato/fill_preset_inventory() for(var/i = 0, i < 7, i++) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index 76533a96c50b..2087581be639 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -187,11 +187,10 @@ for(var/i = 0, i < 2, i++) new /obj/item/storage/box/milk(src) for(var/i = 0, i < 2, i++) - new /obj/item/reagent_container/food/drinks/soymilk(src) + /obj/item/storage/box/soymilk(src) for(var/i = 0, i < 7, i++) new /obj/item/storage/fancy/egg_box(src) - for(var/i = 0, i < 2, i++) - new /obj/item/storage/box/enzyme(src) + new /obj/item/storage/box/enzyme(src) //dry storage for dry food only... /obj/structure/closet/secure_closet/freezer/dry From 7d05de9a3c780dd4143ac244b9d88d9de3db184c Mon Sep 17 00:00:00 2001 From: Julien Date: Tue, 3 Oct 2023 17:58:26 +0200 Subject: [PATCH 19/23] fix --- .../objects/structures/crates_lockers/closets/secure/freezer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index 2087581be639..773b0c5c99e6 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -187,7 +187,7 @@ for(var/i = 0, i < 2, i++) new /obj/item/storage/box/milk(src) for(var/i = 0, i < 2, i++) - /obj/item/storage/box/soymilk(src) + new /obj/item/storage/box/soymilk(src) for(var/i = 0, i < 7, i++) new /obj/item/storage/fancy/egg_box(src) new /obj/item/storage/box/enzyme(src) From c754e87f6215bc84de1265317fb409c1bdc7817b Mon Sep 17 00:00:00 2001 From: Julien Date: Wed, 4 Oct 2023 11:48:24 +0200 Subject: [PATCH 20/23] manually revert because i can't figure how it work --- code/game/objects/items/storage/boxes.dm | 67 --------------- .../crates_lockers/closets/secure/freezer.dm | 82 ------------------- 2 files changed, 149 deletions(-) diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 8e9b3c901872..6266f0eef77d 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -760,70 +760,3 @@ else if(!isopened) isopened = 1 icon_state = "mealpackopened" - - -//food boxes for storage in bulk - -//meat -/obj/item/storage/box/meat - name = "\improper Meat Box" - -/obj/item/storage/box/meat/fill_preset_inventory() - for(var/i = 0, i < 7, i++) - new /obj/item/reagent_container/food/snacks/meat/monkey(src) - -//fish -/obj/item/storage/box/fish - name = "\improper Fish Box" - -/obj/item/storage/box/fish/fill_preset_inventory() - for(var/i = 0, i < 7, i++) - new /obj/item/reagent_container/food/snacks/carpmeat(src) - -//milk -/obj/item/storage/box/milk - name = "\improper Milk Box" - -/obj/item/storage/box/milk/fill_preset_inventory() - for(var/i = 0, i < 7, i++) - new /obj/item/reagent_container/food/drinks/milk(src) - -//soymilk -/obj/item/storage/box/soymilk - name = "\improper Soymilk Box" - -/obj/item/storage/box/soymilk/fill_preset_inventory() - for(var/i = 0, i < 7, i++) - new /obj/item/reagent_container/food/drinks/soymilk(src) - -//enzyme -/obj/item/storage/box/enzyme - name = "\improper Enzyme Box" - -/obj/item/storage/box/enzyme/fill_preset_inventory() - for(var/i = 0, i < 7, i++) - new /obj/item/reagent_container/food/condiment/enzyme(src) - -//flour -/obj/item/storage/box/flour - name = "\improper Flour Box" - -/obj/item/storage/box/flour/fill_preset_inventory() - for(var/i = 0, i < 7, i++) - new /obj/item/reagent_container/food/snacks/flour(src) - -//sugar -/obj/item/storage/box/sugar - name = "\improper Sugar Box" - -/obj/item/storage/box/sugar/fill_preset_inventory() - for(var/i = 0, i < 7, i++) - new /obj/item/reagent_container/food/condiment/sugar(src) - -//potato -/obj/item/storage/box/potato - name = "\improper Potato Box" - -/obj/item/storage/box/potato/fill_preset_inventory() - for(var/i = 0, i < 7, i++) - new /obj/item/reagent_container/food/snacks/grown/potato(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index 773b0c5c99e6..323ff50fd63b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -157,85 +157,3 @@ containers++ if(containers > 3) break - -//almayer surplus storage - -//meat surplus -/obj/structure/closet/secure_closet/freezer/meat_stock - name = "meat" - -/obj/structure/closet/secure_closet/freezer/meat_stock/Initialize() - . = ..() - for(var/i = 0, i < 2, i++) - new /obj/item/storage/box/meat(src) - -//fish surplus -/obj/structure/closet/secure_closet/freezer/fish_stock - name = "fish" - -/obj/structure/closet/secure_closet/freezer/fish_stock/Initialize() - . = ..() - for(var/i = 0, i < 2, i++) - new /obj/item/storage/box/fish(src) - -//groceries to hold milk in bulk -/obj/structure/closet/secure_closet/freezer/groceries - name = "Groceries" - -/obj/structure/closet/secure_closet/freezer/groceries/Initialize() - . = ..() - for(var/i = 0, i < 2, i++) - new /obj/item/storage/box/milk(src) - for(var/i = 0, i < 2, i++) - new /obj/item/storage/box/soymilk(src) - for(var/i = 0, i < 7, i++) - new /obj/item/storage/fancy/egg_box(src) - new /obj/item/storage/box/enzyme(src) - -//dry storage for dry food only... -/obj/structure/closet/secure_closet/freezer/dry - name = "dry" - -/obj/structure/closet/secure_closet/freezer/dry/Initialize() - . = ..() - for(var/i = 0, i < 4, i++) - new /obj/item/storage/box/flour(src) - new /obj/item/storage/box/sugar(src) - -//plant only - -/obj/structure/closet/secure_closet/freezer/plants - name = "Plants" - -/obj/structure/closet/secure_closet/freezer/plants/Initialize() - . = ..() - for(var/i = 0, i < 2, i++) - new /obj/item/reagent_container/food/snacks/grown/apple(src) - for(var/i = 0, i < 2, i++) - new /obj/item/reagent_container/food/snacks/grown/cabbage(src) - for(var/i = 0, i < 2, i++) - new /obj/item/reagent_container/food/snacks/grown/carrot(src) - for(var/i = 0, i < 2, i++) - new /obj/item/reagent_container/food/snacks/grown/mushroom/chanterelle(src) - for(var/i = 0, i < 2, i++) - new /obj/item/reagent_container/food/snacks/grown/chili(src) - for(var/i = 0, i < 2, i++) - new /obj/item/reagent_container/food/snacks/grown/corn(src) - for(var/i = 0, i < 2, i++) - new /obj/item/reagent_container/food/snacks/grown/eggplant(src) - for(var/i = 0, i < 2, i++) - new /obj/item/reagent_container/food/snacks/grown/potato(src) - for(var/i = 0, i < 2, i++) - new /obj/item/reagent_container/food/snacks/grown/tomato(src) - for(var/i = 0, i < 2, i++) - new /obj/item/reagent_container/food/snacks/grown/whitebeet(src) - for(var/i = 0, i < 2, i++) - new /obj/item/reagent_container/food/snacks/grown/cherries(src) - for(var/i = 0, i < 2, i++) - new /obj/item/reagent_container/food/snacks/grown/lime(src) - for(var/i = 0, i < 2, i++) - new /obj/item/reagent_container/food/snacks/grown/lemon(src) - for(var/i = 0, i < 2, i++) - new /obj/item/reagent_container/food/snacks/grown/orange(src) - for(var/i = 0, i < 2, i++) - new /obj/item/reagent_container/food/snacks/grown/banana(src) From 05bcd64d471aab3cabe7b8b010629e25b84fc242 Mon Sep 17 00:00:00 2001 From: Julien Date: Wed, 4 Oct 2023 12:02:56 +0200 Subject: [PATCH 21/23] revert map change --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 09517e8acb13..233d2cc0484e 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -30276,9 +30276,12 @@ }, /area/almayer/squads/req) "dpn" = ( +/obj/structure/closet/secure_closet/freezer/fridge/full, /obj/structure/machinery/light{ dir = 1 }, +/obj/item/reagent_container/food/condiment/enzyme, +/obj/item/reagent_container/food/condiment/enzyme, /obj/structure/transmitter{ name = "Kitchen Telephone"; phone_category = "Almayer"; @@ -30286,7 +30289,6 @@ pixel_x = -8; pixel_y = 29 }, -/obj/structure/closet/secure_closet/freezer/dry, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -34876,8 +34878,9 @@ }, /area/almayer/engineering/upper_engineering/starboard) "fhQ" = ( +/obj/structure/closet/secure_closet/freezer/fridge/full, /obj/structure/machinery/light, -/obj/structure/closet/secure_closet/freezer/groceries, +/obj/item/reagent_container/food/condiment/sugar, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -46823,10 +46826,10 @@ }, /area/almayer/squads/bravo) "ksA" = ( +/obj/structure/closet/secure_closet/freezer/fridge/groceries, /obj/structure/machinery/light{ dir = 8 }, -/obj/structure/closet/secure_closet/freezer/plants, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -57164,7 +57167,7 @@ }, /area/almayer/medical/hydroponics) "oMd" = ( -/obj/structure/closet/secure_closet/freezer/fish_stock, +/obj/structure/closet/secure_closet/freezer/meat, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -57873,7 +57876,7 @@ }, /area/almayer/hull/lower_hull/l_f_p) "pdt" = ( -/obj/structure/closet/secure_closet/freezer/plants, +/obj/structure/closet/secure_closet/freezer/fridge/groceries, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -72381,12 +72384,6 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north1) -"vmO" = ( -/obj/structure/closet/secure_closet/freezer/meat_stock, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/grunt_rnr) "vmW" = ( /turf/open/floor/almayer{ dir = 6; @@ -113145,7 +113142,7 @@ loY wXI nUd lkd -vmO +oMd bDs gSk oDE From 4ef3ac17f15cf46bf1950b25a36727900257b9a6 Mon Sep 17 00:00:00 2001 From: Julien Date: Wed, 4 Oct 2023 12:29:09 +0200 Subject: [PATCH 22/23] add four more armor for upper medical armory --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 233d2cc0484e..a3a12c285ca1 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -3958,6 +3958,10 @@ /obj/item/clothing/suit/storage/marine/light/vest, /obj/item/clothing/suit/storage/marine/light/vest, /obj/structure/surface/rack, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, +/obj/item/clothing/suit/storage/marine/light/vest, /turf/open/floor/almayer{ icon_state = "redfull" }, From a8031b1896d1da8ef00fd4aa36684b11105c6da8 Mon Sep 17 00:00:00 2001 From: Julien Date: Wed, 4 Oct 2023 12:35:09 +0200 Subject: [PATCH 23/23] change M4a3 to a full pistol belt with it in it --- .../crates_lockers/closets/secure/guncabinet/level_red.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm index 4d7f8a78f9bb..093aac33f7d0 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm @@ -78,10 +78,10 @@ /obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol/Initialize() . = ..() - new /obj/item/weapon/gun/pistol/m4a3(src) - new /obj/item/weapon/gun/pistol/m4a3(src) - new /obj/item/weapon/gun/pistol/m4a3(src) - new /obj/item/weapon/gun/pistol/m4a3(src) + new /obj/item/storage/belt/gun/m4a3/full(src) + new /obj/item/storage/belt/gun/m4a3/full(src) + new /obj/item/storage/belt/gun/m4a3/full(src) + new /obj/item/storage/belt/gun/m4a3/full(src) new /obj/item/ammo_box/magazine/m4a3(src) // 2 M39 cabinet are in medical armory (4 M39 and 12 mags)