diff --git a/modular_ss220/modular_ss220.dme b/modular_ss220/modular_ss220.dme index 7382887ee589..ff4752541cbc 100644 --- a/modular_ss220/modular_ss220.dme +++ b/modular_ss220/modular_ss220.dme @@ -79,6 +79,7 @@ // 2. Так модпаки прайма будут включены в тестах и линтере. #ifndef MODPACK_MAIN_ONLY #include "security_redalert_accesses/_security_redalert_accesses.dme" +#include "prime_only/_prime.dme" #endif // --- UNUSED MODS --- // diff --git a/modular_ss220/objects/code/closets.dm b/modular_ss220/objects/code/closets.dm index bed8e2591774..12c36417138c 100644 --- a/modular_ss220/objects/code/closets.dm +++ b/modular_ss220/objects/code/closets.dm @@ -10,9 +10,3 @@ new /obj/item/gun/energy/laser/awaymission_aeg/rnd(src) new /obj/item/storage/firstaid/regular(src) new /obj/item/paper/pamphlet/gateway(src) - -/obj/structure/closet/secure_closet/hos/populate_contents() - . = ..() - new /obj/item/clothing/gloves/combat(src) - for(var/i in 1 to 3) - new /obj/item/ammo_box/speed_loader_d44(src) diff --git a/modular_ss220/objects/code/miscellaneous.dm b/modular_ss220/objects/code/miscellaneous.dm index 50ce16adca4d..438b14427c45 100644 --- a/modular_ss220/objects/code/miscellaneous.dm +++ b/modular_ss220/objects/code/miscellaneous.dm @@ -136,3 +136,9 @@ icon_state = "archives" light_range = 1.5 light_color = LIGHT_COLOR_FIRE + +// Display Cases +/obj/structure/displaycase/hos + alert = TRUE + start_showpiece_type = /obj/item/reagent_containers/food/snacks/donut/sprinkles + req_access = list(ACCESS_HOS) diff --git a/modular_ss220/objects/code/weapons.dm b/modular_ss220/objects/code/weapons.dm index 785e1e7a9ae2..f12097faa503 100644 --- a/modular_ss220/objects/code/weapons.dm +++ b/modular_ss220/objects/code/weapons.dm @@ -29,7 +29,6 @@ playsound(user, dry_fire_sound, 100, 1) // Colt Anaconda .44 - /obj/item/gun/projectile/revolver/reclinable/anaconda name = "Анаконда" desc = "Крупнокалиберный револьвер двадцатого века. Несмотря на то, что оружие хранилось в хороших условиях, старина даёт о себе знать." @@ -89,13 +88,7 @@ icon = 'modular_ss220/objects/icons/ammo.dmi' icon_state = "44_box" -/obj/structure/displaycase/hos - alert = TRUE - start_showpiece_type = /obj/item/gun/projectile/revolver/reclinable/anaconda - req_access = list(ACCESS_HOS) - // RSH-12 12.7 - /obj/item/gun/projectile/revolver/reclinable/rsh12 name = "РШ-12" desc = "Тяжёлый револьвер винтовочного калибра с откидным стволом. По слухам, всё ещё находится на вооружении у СССП." diff --git a/modular_ss220/prime_only/_prime.dm b/modular_ss220/prime_only/_prime.dm new file mode 100644 index 000000000000..18b003263ed0 --- /dev/null +++ b/modular_ss220/prime_only/_prime.dm @@ -0,0 +1,13 @@ +/datum/modpack/prime_only + name = "Эксклюзивы прайма" + desc = "Всё что попросили стримеры эксклюзивно для прайма." + author = "Все кто сюда полез." + +/datum/modpack/prime_only/pre_initialize() + . = ..() + +/datum/modpack/prime_only/initialize() + . = ..() + +/datum/modpack/prime_only/post_initialize() + . = ..() diff --git a/modular_ss220/prime_only/_prime.dme b/modular_ss220/prime_only/_prime.dme new file mode 100644 index 000000000000..1b7d8f11f96f --- /dev/null +++ b/modular_ss220/prime_only/_prime.dme @@ -0,0 +1,3 @@ +#include "_prime.dm" + +#include "code/anakonda.dm" diff --git a/modular_ss220/prime_only/code/anakonda.dm b/modular_ss220/prime_only/code/anakonda.dm new file mode 100644 index 000000000000..75e1c5ca70d3 --- /dev/null +++ b/modular_ss220/prime_only/code/anakonda.dm @@ -0,0 +1,8 @@ +/obj/structure/displaycase/hos + start_showpiece_type = /obj/item/gun/projectile/revolver/reclinable/anaconda + +/obj/structure/closet/secure_closet/hos/populate_contents() + . = ..() + new /obj/item/clothing/gloves/combat(src) + for(var/i in 1 to 3) + new /obj/item/ammo_box/speed_loader_d44(src)