diff --git a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm index a7eac1fe1a8..edd734ee6f5 100644 --- a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm +++ b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm @@ -1062,7 +1062,7 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/dangerous_research/lab) "oJ" = ( -/obj/structure/closet/crate/medical, +/obj/structure/closet/crate/secure/interdyne, /obj/item/stack/medical/suture/emergency, /obj/item/stack/medical/gauze/twelve, /obj/item/reagent_containers/hypospray/medipen/blood_loss, @@ -2155,7 +2155,7 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/dangerous_research/lab) "BG" = ( -/obj/structure/closet/crate, +/obj/structure/closet/crate/secure/interdyne, /obj/item/stack/sheet/mineral/plasma/thirty, /obj/item/stack/sheet/mineral/wood/fifty, /obj/item/stack/sheet/iron/fifty, @@ -3658,7 +3658,7 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/dangerous_research) "VQ" = ( -/obj/structure/closet/crate, +/obj/structure/closet/crate/secure/interdyne, /obj/item/reagent_containers/cup/glass/waterbottle/large, /obj/item/reagent_containers/cup/glass/waterbottle/large, /obj/item/reagent_containers/cup/glass/waterbottle/large, diff --git a/_maps/shuttles/pirate_ex_interdyne.dmm b/_maps/shuttles/pirate_ex_interdyne.dmm index f1e6c74c570..0f3476c0542 100644 --- a/_maps/shuttles/pirate_ex_interdyne.dmm +++ b/_maps/shuttles/pirate_ex_interdyne.dmm @@ -253,7 +253,7 @@ /area/shuttle/pirate) "aS" = ( /obj/effect/turf_decal/tile/dark_blue/opposingcorners, -/obj/structure/closet/crate/freezer/blood, +/obj/structure/closet/crate/freezer/blood/interdyne, /obj/machinery/light/small/blacklight/directional/south, /obj/machinery/iv_drip, /turf/open/floor/iron/dark, diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 7b64b6569d6..cac9fbaf890 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -222,6 +222,12 @@ icon_state = "medicalcrate" base_icon_state = "medicalcrate" +/obj/structure/closet/crate/deforest + name = "deforest medical crate" + desc = "A DeFortest brand crate of medical supplies." + icon_state = "deforest" + base_icon_state = "deforest" + /obj/structure/closet/crate/medical/department icon_state = "medical" base_icon_state = "medical" @@ -290,6 +296,24 @@ icon_state = "food" base_icon_state = "food" +/obj/structure/closet/crate/freezer/donk + name = "donk co. fridge" + desc = "A Donk Co. brand fridge, keeps your donkpcokets and foam ammunition fresh!" + icon_state = "donkcocrate" + base_icon_state = "donkcocrate" + +/obj/structure/closet/crate/freezer/interdyne + name = "interdyne freezer" + desc = "Interdyne Pharmauceutics branded freezer. Might or might not contain cold steel, or fresh organs." + icon_state = "interdynefreezer" + base_icon_state = "interdynefreezer" + +/obj/structure/closet/crate/freezer/blood/interdyne + name = "interdyne blood freezer" + desc = "Interdyne Pharmauceutics branded freezer. Only freshly harvested- I mean, freshly kept blood inside!" + icon_state = "interdynefreezer" + base_icon_state = "interdynefreezer" + /obj/structure/closet/crate/radiation desc = "A crate with a radiation sign on it." name = "radiation crate" @@ -312,6 +336,12 @@ icon_state = "cargo" base_icon_state = "cargo" +/obj/structure/closet/crate/robust + name = "robust industries crate" + desc = "Robust Inustries LLC. crate. Feels oddly nostalgic." + icon_state = "robust" + base_icon_state = "robust" + /obj/structure/closet/crate/cargo/mining name = "mining crate" icon_state = "mining" @@ -322,6 +352,12 @@ icon_state = "engi_crate" base_icon_state = "engi_crate" +/obj/structure/closet/crate/nakamura + name = "nakamura engineering crate" + desc = "Crate from Nakamura Engineering, most likely containing engineering supplies or MODcores." + icon_state = "nakamura" + base_icon_state = "nakamura" + /obj/structure/closet/crate/engineering/electrical icon_state = "engi_e_crate" base_icon_state = "engi_e_crate" diff --git a/code/game/objects/structures/crates_lockers/crates/secure.dm b/code/game/objects/structures/crates_lockers/crates/secure.dm index 1a102fdb512..e93591f1d59 100644 --- a/code/game/objects/structures/crates_lockers/crates/secure.dm +++ b/code/game/objects/structures/crates_lockers/crates/secure.dm @@ -44,6 +44,17 @@ icon_state = "weaponcrate" base_icon_state = "weaponcrate" +/obj/structure/closet/crate/secure/gorlex_weapons + desc = "A secure weapons crate of Gorlex Marauders." + name = "weapons crate" + icon_state = "gorlex_weaponcrate" + base_icon_state = "gorlex_weaponcrate" + +/obj/structure/closet/crate/secure/gorlex_weapons/jammed + desc = "A beaten up, jammed open weapon crate of Gorlex Marauders." + name = "jammed weapons crate" + locked = FALSE + /obj/structure/closet/crate/secure/plasma desc = "A secure plasma crate." name = "plasma crate" @@ -192,3 +203,65 @@ else if(!silent) to_chat(user, span_warning("[src] is broken!")) else ..() + +/obj/structure/closet/crate/secure/interdyne + name = "interdyne crate" + desc = "Crate belonging to Interdyne Pharmaceutics. Hopefully doesn't have bioweapons inside..." + icon_state = "interdynecrate" + base_icon_state = "interdynecrate" + +/obj/structure/closet/crate/secure/tiger + name = "tiger co-op crate" + icon_state = "tigercrate" + base_icon_state = "tigercrate" + +/obj/structure/closet/crate/secure/self + name = "s.e.l.f. crate" + desc = "A secure crate locked from the inside with a scanning panel above it and holographic display of lock's status. Sentient Engine Liberation Front engineers are quite the show-offs." + icon_state = "selfcrate" + base_icon_state = "selfcrate" + +/obj/structure/closet/crate/secure/m13 + name = "mysterious secure crate" + desc = "A secure crate. Lacks any obvious logos or even codes for where it arrived from, but looks like taken straight from a spy movie." + icon_state = "mithirteencrate" + base_icon_state = "mithirteencrate" + +/obj/structure/closet/crate/secure/arc + name = "animal rights consortium crate" + icon_state = "arccrate" + base_icon_state = "arccrate" + +/obj/structure/closet/crate/secure/cybersun + name = "cybersun crate" + +/obj/structure/closet/crate/secure/cybersun/dawn + desc = "A secure crate from Cybersun Industries. It has distinct orange-green colouring, probably of some departament or division, but you cannot tell what is it." + icon_state = "cyber_dawncrate" + base_icon_state = "cyber_dawncrate" + +/obj/structure/closet/crate/secure/cybersun/noon + desc = "A secure crate from Cybersun Industries. It has distinct yellow-orange colouring, probably of some departament or division, but you cannot tell what is it." + icon_state = "cyber_nooncrate" + base_icon_state = "cyber_nooncrate" + +/obj/structure/closet/crate/secure/cybersun/dusk + desc = "A secure crate from Cybersun Industries. It has distinct purple-green colouring, probably of some departament or division, but you cannot tell what is it." + icon_state = "cyber_duskcrate" + base_icon_state = "cyber_duskcrate" + +/obj/structure/closet/crate/secure/cybersun/night + desc = "A secure crate from Cybersun Industries. This one blatantly adorns syndicate colours. You can only guess it contains equipement for syndicate operatives." + icon_state = "cyber_nightcrate" + base_icon_state = "cyber_nightcrate" + +/obj/structure/closet/crate/secure/wafflecorp + name = "wafflecorp crate" + desc = "A very outdated model and design of shipment crate with a modern lock strapped on it, how befitting of its brand owner, Waffle Corporation. Golden lettering written in cursive by the logo reads 'bringing you consecutively top five world-wide rated* breakfast since 2055. A much smaller fineprint, also in cursive, clarifies: '*in years 2099-2126'... It's year 2563 now, however." + icon_state = "wafflecrate" + base_icon_state = "wafflecrate" + +/obj/structure/closet/crate/secure/gorlex + name = "gorlex marauders crate" + icon_state = "gorlexcrate" + base_icon_state = "gorlexcrate" diff --git a/code/modules/cargo/packs/engineering.dm b/code/modules/cargo/packs/engineering.dm index 907ae1598c6..e8255a58e64 100644 --- a/code/modules/cargo/packs/engineering.dm +++ b/code/modules/cargo/packs/engineering.dm @@ -76,7 +76,7 @@ cost = CARGO_CRATE_VALUE * 4 contains = list(/obj/item/inducer/orderable = 2) crate_name = "inducer crate" - crate_type = /obj/structure/closet/crate/engineering/electrical + crate_type = /obj/structure/closet/crate/nakamura /datum/supply_pack/engineering/pacman name = "P.A.C.M.A.N Generator Crate" @@ -86,7 +86,7 @@ access_view = ACCESS_ENGINEERING contains = list(/obj/machinery/power/port_gen/pacman) crate_name = "\improper PACMAN generator crate" - crate_type = /obj/structure/closet/crate/engineering/electrical + crate_type = /obj/structure/closet/crate/nakamura /datum/supply_pack/engineering/power name = "Power Cell Crate" diff --git a/code/modules/cargo/packs/imports.dm b/code/modules/cargo/packs/imports.dm index 98fc4d65021..fc35e473f5a 100644 --- a/code/modules/cargo/packs/imports.dm +++ b/code/modules/cargo/packs/imports.dm @@ -17,6 +17,7 @@ cost = CARGO_CRATE_VALUE * 2 contains = list(/obj/item/gun/ballistic/shotgun/toy = 8) crate_name = "foam force crate" + crate_type = /obj/structure/closet/crate/freezer/donk discountable = SUPPLY_PACK_STD_DISCOUNTABLE /datum/supply_pack/imports/foamforce/bonus @@ -30,6 +31,7 @@ /obj/item/ammo_box/magazine/toy/pistol = 2, ) crate_name = "foam force crate" + crate_type = /obj/structure/closet/crate/freezer/donk /datum/supply_pack/imports/meatmeatmeatmeat // MEAT MEAT MEAT MEAT name = "MEAT MEAT MEAT MEAT MEAT" @@ -141,6 +143,7 @@ /obj/item/gun/ballistic/automatic/wt550 = 2, /obj/item/ammo_box/magazine/wt550m9 = 2, ) + crate_type = /obj/structure/closet/crate/secure/gorlex_weapons/jammed /datum/supply_pack/imports/wt550ammo name = "Smuggled WT-550 Ammo Crate" @@ -153,7 +156,7 @@ /obj/item/ammo_box/magazine/wt550m9/wtic = 2, ) crate_name = "emergency crate" - crate_type = /obj/structure/closet/crate/internals + crate_type = /obj/structure/closet/crate/secure/gorlex_weapons/jammed /datum/supply_pack/imports/shocktrooper name = "Shocktrooper Crate" @@ -169,6 +172,7 @@ /obj/item/clothing/suit/armor/vest, /obj/item/clothing/head/helmet, ) + crate_type = /obj/structure/closet/crate/secure/gorlex_weapons/jammed /datum/supply_pack/imports/specialops name = "Special Ops Crate" @@ -184,6 +188,7 @@ /obj/item/switchblade, /obj/item/grenade/mirage = 5, ) + crate_type = /obj/structure/closet/crate/secure/gorlex_weapons/jammed /datum/supply_pack/imports/russian name = "Russian Surplus Military Gear Crate" diff --git a/code/modules/cargo/packs/medical.dm b/code/modules/cargo/packs/medical.dm index d44e8c42d37..a112ada0e55 100644 --- a/code/modules/cargo/packs/medical.dm +++ b/code/modules/cargo/packs/medical.dm @@ -29,7 +29,7 @@ /obj/item/reagent_containers/hypospray/medipen/ekit = 3, /obj/item/reagent_containers/hypospray/medipen/blood_loss = 3) crate_name = "medipen crate" - crate_type = /obj/structure/closet/crate/medical + crate_type = /obj/structure/closet/crate/deforest /datum/supply_pack/medical/coroner_crate name = "Autopsy Kit" @@ -138,6 +138,7 @@ /obj/item/emergency_bed, ) crate_name = "surgical supplies crate" + crate_type = /obj/structure/closet/crate/deforest /datum/supply_pack/medical/salglucanister name = "Heavy-Duty Saline Canister" diff --git a/code/modules/cargo/packs/science.dm b/code/modules/cargo/packs/science.dm index dfa2a663593..6b4f38b95a0 100644 --- a/code/modules/cargo/packs/science.dm +++ b/code/modules/cargo/packs/science.dm @@ -189,4 +189,4 @@ access_view = ACCESS_ROBOTICS contains = list(/obj/item/mod/core/standard = 3) crate_name = "\improper MOD core crate" - crate_type = /obj/structure/closet/crate/secure/science/robo + crate_type = /obj/structure/closet/crate/nakamura diff --git a/code/modules/cargo/packs/service.dm b/code/modules/cargo/packs/service.dm index bf6afe107d6..26af45f960a 100644 --- a/code/modules/cargo/packs/service.dm +++ b/code/modules/cargo/packs/service.dm @@ -245,7 +245,7 @@ /obj/item/food/ready_donk/donkhiladas, ) crate_name = "\improper Ready-Donk crate" - crate_type = /obj/structure/closet/crate/freezer/food + crate_type = /obj/structure/closet/crate/freezer/donk discountable = SUPPLY_PACK_UNCOMMON_DISCOUNTABLE /datum/supply_pack/service/randomized/ready_donk/fill(obj/structure/closet/crate/C) @@ -269,6 +269,7 @@ /obj/item/reagent_containers/cup/bottle/syrup_bottle/caramel, //one extra syrup as a treat ) crate_name = "coffee equipment crate" + crate_type = /obj/structure/closet/crate/robust discountable = SUPPLY_PACK_UNCOMMON_DISCOUNTABLE /datum/supply_pack/service/coffeemaker diff --git a/code/modules/cargo/packs/vending_restock.dm b/code/modules/cargo/packs/vending_restock.dm index 6437e6027b8..e5ae6f25c93 100644 --- a/code/modules/cargo/packs/vending_restock.dm +++ b/code/modules/cargo/packs/vending_restock.dm @@ -17,7 +17,7 @@ cost = CARGO_CRATE_VALUE * 2 contains = list(/obj/item/vending_refill/cigarette) crate_name = "cigarette supply crate" - crate_type = /obj/structure/closet/crate + crate_type = /obj/structure/closet/crate/robust /datum/supply_pack/vending/science/cytopro name = "Cytology Vendor Supply Crate" @@ -113,6 +113,7 @@ cost = CARGO_CRATE_VALUE * 2 contains = list(/obj/item/vending_refill/snack) crate_name = "snacks supply crate" + crate_type = /obj/structure/closet/crate/robust /datum/supply_pack/vending/cola name = "Softdrinks Supply Crate" diff --git a/icons/obj/storage/crates.dmi b/icons/obj/storage/crates.dmi index 017fcc59364..a5a26c285a7 100644 Binary files a/icons/obj/storage/crates.dmi and b/icons/obj/storage/crates.dmi differ diff --git a/icons/obj/vending_restock.dmi b/icons/obj/vending_restock.dmi index 836aebca7ae..ca8e40349c4 100644 Binary files a/icons/obj/vending_restock.dmi and b/icons/obj/vending_restock.dmi differ