Починил выдачу донат-лодаута ассистентам после раундстарта. Чутка уве…

…личил скорость печати СБ-Протолата. Вывел возможность печатать летальное вооружение на Красный Код, нелетальное на Янтарный. Добавил возможность распечатать маячок для последующей высадки мехов для каждого отдела с определённого Цветового Кода за в два раза большее количество ресурсов.
Kush1Push1 · Jan 9, 2024 · 203bdf3 · 203bdf3
1 parent 28bf951
commit 203bdf3
Show file tree

Hide file tree

Showing 27 changed files with 328 additions and 76 deletions.
diff --git a/code/_globalvars/lists/loadout_categories.dm b/code/_globalvars/lists/loadout_categories.dm
@@ -15,7 +15,7 @@ GLOBAL_LIST_INIT(loadout_categories, list(
 	LOADOUT_CATEGORY_SHOES = LOADOUT_SUBCATEGORIES_NONE,
 	LOADOUT_CATEGORY_GLOVES = LOADOUT_SUBCATEGORIES_NONE,
 	LOADOUT_CATEGORY_GLASSES = LOADOUT_SUBCATEGORIES_NONE,
-	LOADOUT_CATEGORY_DONATOR = list(LOADOUT_SUBCATEGORY_NONE, LOADOUT_SUBCATEGORIES_DON01, LOADOUT_SUBCATEGORIES_DON02, LOADOUT_SUBCATEGORIES_DON03, LOADOUT_SUBCATEGORIES_DON04),
+	LOADOUT_CATEGORY_DONATOR = list(LOADOUT_SUBCATEGORIES_DON01, LOADOUT_SUBCATEGORIES_DON02, LOADOUT_SUBCATEGORIES_DON03, LOADOUT_SUBCATEGORIES_DON04),
 	LOADOUT_CATEGORY_UNLOCKABLE = LOADOUT_SUBCATEGORIES_NONE,
 	LOADOUT_CATEGORY_GENERAL_UNDER = list(LOADOUT_SUBCATEGORY_UNDERWEAR, LOADOUT_SUBCATEGORY_SHIRT, LOADOUT_SUBCATEGORY_SOCKS),
 	LOADOUT_CATEGORY_WRISTS = list(LOADOUT_SUBCATEGORY_WATCHES, LOADOUT_SUBCATEGORY_NONE), //DIDN'T NOTICE THIS

diff --git a/code/modules/cargo/packs/materials.dm b/code/modules/cargo/packs/materials.dm
@@ -17,7 +17,7 @@
 	crate_type = /obj/structure/closet/secure_closet/cargo
 	name = "50 Cardboard Sheets"
 	desc = "Создайте кучу коробок."
-	cost = 300 //thrice their export value
+	cost = 3000
 	contains = list(/obj/item/stack/sheet/cardboard/fifty)
 
 /datum/supply_pack/materials/license50
@@ -31,14 +31,14 @@
 	crate_type = /obj/structure/closet/secure_closet/cargo
 	name = "50 Стеклянных листов"
 	desc = "Let some nice light in with fifty glass sheets!"
-	cost = 300 //double their export value
+	cost = 3000
 	contains = list(/obj/item/stack/sheet/glass/fifty)
 
 /datum/supply_pack/materials/metal50
 	crate_type = /obj/structure/closet/secure_closet/cargo
 	name = "50 Metal Sheets"
 	desc = "Любой строительный проект начинается с хорошей стопки из пятидесяти металлических листов!"
-	cost = 300 //double their export value
+	cost = 3000
 	contains = list(/obj/item/stack/sheet/metal/fifty)
 
 /datum/supply_pack/materials/plasteel20
@@ -52,21 +52,21 @@
 	crate_type = /obj/structure/closet/secure_closet/cargo
 	name = "20 Plastic Sheets"
 	desc = "Соберите неограниченное количество игрушек из пятидесяти пластиковых листов!"
-	cost = 200 // double their export
+	cost = 2000
 	contains = list(/obj/item/stack/sheet/plastic/twenty)
 
 /datum/supply_pack/materials/sandstone30
 	crate_type = /obj/structure/closet/secure_closet/cargo
 	name = "30 Sandstone Blocks"
 	desc = "Ни песчаные, ни каменные, эти тридцать блоков все равно выполнят свою работу."
-	cost = 150 // five times their export
+	cost = 1500
 	contains = list(/obj/item/stack/sheet/mineral/sandstone/thirty)
 
 /datum/supply_pack/materials/wood20
 	crate_type = /obj/structure/closet/secure_closet/cargo
 	name = "20 Wood Planks"
 	desc = "Превратите скучную плитку в красивый панельный пол и многое другое с помощью двадцати деревянных досок!"
-	cost = 400 // 6-7 planks shy from having equal import/export prices
+	cost = 4000 // 6-7 planks shy from having equal import/export prices
 	contains = list(/obj/item/stack/sheet/mineral/wood/twenty)
 
 /datum/supply_pack/materials/rcdammo

diff --git a/code/modules/jobs/job_types/service/assistant.dm b/code/modules/jobs/job_types/service/assistant.dm
@@ -17,7 +17,6 @@ Assistant
 	paycheck = PAYCHECK_ASSISTANT // Get a job. Job reassignment changes your paycheck now. Get over it.
 	paycheck_department = ACCOUNT_CIV
 	display_order = JOB_DISPLAY_ORDER_ASSISTANT
-	dresscodecompliant = FALSE
 	always_can_respawn_as = TRUE
 	threat = 0.2
 

diff --git a/code/modules/jobs/job_types/service/clown.dm b/code/modules/jobs/job_types/service/clown.dm
@@ -77,7 +77,7 @@
 /datum/outfit/job/clown/pre_equip(mob/living/carbon/human/H, visualsOnly)
 	. = ..()
 	if(HAS_TRAIT(SSstation, STATION_TRAIT_BANANIUM_SHIPMENTS))
-		backpack_contents[/obj/item/stack/sheet/mineral/bananium] = 5
+		backpack_contents[/obj/item/stack/sheet/mineral/bananium] = 25
 
 /datum/outfit/job/clown/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source)
 	..()

diff --git a/code/modules/projectiles/guns/misc/medbeam.dm b/code/modules/projectiles/guns/misc/medbeam.dm
@@ -14,6 +14,9 @@
 	var/datum/beam/current_beam = null
 	var/mounted = 0 //Denotes if this is a handheld or mounted version
 
+	var/main_heal = -8
+	var/second_heal = -2
+
 	weapon_weight = WEAPON_MEDIUM
 
 /obj/item/gun/medbeam/Initialize(mapload)
@@ -114,10 +117,10 @@
 /obj/item/gun/medbeam/proc/on_beam_tick(var/mob/living/target)
 	if(target.health != target.maxHealth)
 		new /obj/effect/temp_visual/heal(get_turf(target), "#80F5FF")
-	target.adjustBruteLoss(-4)
-	target.adjustFireLoss(-4)
-	target.adjustToxLoss(-1, forced = TRUE)
-	target.adjustOxyLoss(-1)
+	target.adjustBruteLoss(main_heal)
+	target.adjustFireLoss(main_heal)
+	target.adjustToxLoss(second_heal, forced = TRUE)
+	target.adjustOxyLoss(second_heal)
 	return
 
 /obj/item/gun/medbeam/proc/on_beam_release(var/mob/living/target)
@@ -129,6 +132,8 @@
 //////////////////////////////Mech Version///////////////////////////////
 /obj/item/gun/medbeam/mech
 	mounted = 1
+	main_heal = -16
+	second_heal = -4
 
 /obj/item/gun/medbeam/mech/Initialize(mapload)
 	. = ..()

diff --git a/code/modules/research/designs/mecha_designs.dm b/code/modules/research/designs/mecha_designs.dm
@@ -41,6 +41,7 @@
 	build_path = /obj/item/circuitboard/mecha/gygax/main
 	category = list("Exosuit Modules")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+	min_security_level = SEC_LEVEL_AMBER
 
 /datum/design/board/gygax_peri
 	name = "\"Gygax\" Peripherals Control module"
@@ -49,6 +50,7 @@
 	build_path = /obj/item/circuitboard/mecha/gygax/peripherals
 	category = list("Exosuit Modules")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+	min_security_level = SEC_LEVEL_AMBER
 
 /datum/design/board/gygax_targ
 	name = "\"Gygax\" Weapons & Targeting Control module"
@@ -57,6 +59,7 @@
 	build_path = /obj/item/circuitboard/mecha/gygax/targeting
 	category = list("Exosuit Modules")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+	min_security_level = SEC_LEVEL_AMBER
 
 /datum/design/board/durand_main
 	name = "\"Durand\" Central Control module"
@@ -65,6 +68,7 @@
 	build_path = /obj/item/circuitboard/mecha/durand/main
 	category = list("Exosuit Modules")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+	min_security_level = SEC_LEVEL_AMBER
 
 /datum/design/board/durand_peri
 	name = "\"Durand\" Peripherals Control module"
@@ -73,6 +77,7 @@
 	build_path = /obj/item/circuitboard/mecha/durand/peripherals
 	category = list("Exosuit Modules")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+	min_security_level = SEC_LEVEL_AMBER
 
 /datum/design/board/durand_targ
 	name = "\"Durand\" Weapons & Targeting Control module"
@@ -81,6 +86,7 @@
 	build_path = /obj/item/circuitboard/mecha/durand/targeting
 	category = list("Exosuit Modules")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+	min_security_level = SEC_LEVEL_AMBER
 
 /datum/design/board/honker_main
 	name = "\"H.O.N.K\" Central Control module"
@@ -114,6 +120,7 @@
 	build_path = /obj/item/circuitboard/mecha/phazon/main
 	category = list("Exosuit Modules")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+	min_security_level = SEC_LEVEL_RED
 
 /datum/design/board/phazon_peri
 	name = "\"Phazon\" Peripherals Control module"
@@ -123,6 +130,7 @@
 	build_path = /obj/item/circuitboard/mecha/phazon/peripherals
 	category = list("Exosuit Modules")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+	min_security_level = SEC_LEVEL_RED
 
 /datum/design/board/phazon_targ
 	name = "\"Phazon\" Weapons & Targeting Control module"
@@ -132,6 +140,7 @@
 	build_path = /obj/item/circuitboard/mecha/phazon/targeting
 	category = list("Exosuit Modules")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+	min_security_level = SEC_LEVEL_RED
 
 ////////////////////////////////////////
 /////////// Mecha Equpment /////////////
@@ -146,6 +155,7 @@
 	materials = list(/datum/material/iron=10000)
 	construction_time = 100
 	category = list("Exosuit Equipment")
+	min_security_level = SEC_LEVEL_RED
 
 /datum/design/mech_seedscatter
 	name = "Exosuit Weapon (Melon Seed \"Scattershot\")"
@@ -156,6 +166,7 @@
 	materials = list(/datum/material/iron=10000, /datum/material/glass = 10000)
 	construction_time = 70
 	category = list("Exosuit Equipment")
+	min_security_level = SEC_LEVEL_RED
 
 /datum/design/mech_scattershot_ammo
 	name = "Scattershot Ammunition"
@@ -167,6 +178,7 @@
 	construction_time = 20
 	category = list("Exosuit Ammunition", "Ammo")
 	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+	min_security_level = SEC_LEVEL_RED
 
 /datum/design/mech_carbine
 	name = "Exosuit Weapon (FNX-99 \"Hades\" Carbine)"
@@ -177,6 +189,7 @@
 	materials = list(/datum/material/iron=10000)
 	construction_time = 100
 	category = list("Exosuit Equipment")
+	min_security_level = SEC_LEVEL_RED
 
 /datum/design/mech_carbine_ammo
 	name = "FNX-99 Carbine Ammunition"
@@ -188,6 +201,7 @@
 	construction_time = 20
 	category = list("Exosuit Ammunition", "Ammo")
 	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+	min_security_level = SEC_LEVEL_RED
 
 /datum/design/mech_ion
 	name = "Exosuit Weapon (MKIV Ion Heavy Cannon)"
@@ -198,6 +212,7 @@
 	materials = list(/datum/material/iron=20000,/datum/material/silver=6000,/datum/material/uranium=2000)
 	construction_time = 100
 	category = list("Exosuit Equipment")
+	min_security_level = SEC_LEVEL_RED
 
 /datum/design/mech_tesla
 	name = "Exosuit Weapon (MKI Tesla Cannon)"
@@ -208,6 +223,7 @@
 	materials = list(/datum/material/iron=20000,/datum/material/silver=8000)
 	construction_time = 100
 	category = list("Exosuit Equipment")
+	min_security_level = SEC_LEVEL_RED
 
 /datum/design/mech_laser
 	name = "Exosuit Weapon (CH-PS \"Immolator\" Laser)"
@@ -218,6 +234,7 @@
 	materials = list(/datum/material/iron=10000)
 	construction_time = 100
 	category = list("Exosuit Equipment")
+	min_security_level = SEC_LEVEL_RED
 
 /datum/design/mech_laser_heavy
 	name = "Exosuit Weapon (CH-LC \"Solaris\" Laser Cannon)"
@@ -228,6 +245,7 @@
 	materials = list(/datum/material/iron=10000)
 	construction_time = 100
 	category = list("Exosuit Equipment")
+	min_security_level = SEC_LEVEL_RED
 
 /datum/design/mech_grenade_launcher
 	name = "Exosuit Weapon (SGL-6 Grenade Launcher)"
@@ -238,6 +256,7 @@
 	materials = list(/datum/material/iron=22000,/datum/material/gold=6000,/datum/material/silver=8000)
 	construction_time = 100
 	category = list("Exosuit Equipment")
+	min_security_level = SEC_LEVEL_AMBER
 
 /datum/design/mech_grenade_launcher_ammo
 	name = "SGL-6 Grenade Launcher Ammunition"
@@ -249,6 +268,7 @@
 	construction_time = 20
 	category = list("Exosuit Ammunition", "Ammo")
 	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+	min_security_level = SEC_LEVEL_AMBER
 
 /datum/design/mech_missile_rack
 	name = "Exosuit Weapon (BRM-6 Missile Rack)"
@@ -259,6 +279,7 @@
 	materials = list(/datum/material/iron=22000,/datum/material/gold=6000,/datum/material/silver=8000)
 	construction_time = 100
 	category = list("Exosuit Equipment")
+	min_security_level = SEC_LEVEL_RED
 
 /datum/design/mech_missile_rack_ammo
 	name = "BRM-6 Missile Rack Ammunition"
@@ -270,6 +291,7 @@
 	construction_time = 20
 	category = list("Exosuit Ammunition", "Ammo")
 	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+	min_security_level = SEC_LEVEL_RED
 
 /datum/design/clusterbang_launcher
 	name = "Exosuit Module (SOB-3 Clusterbang Launcher)"
@@ -280,6 +302,7 @@
 	materials = list(/datum/material/iron=20000,/datum/material/gold=10000,/datum/material/uranium=10000)
 	construction_time = 100
 	category = list("Exosuit Equipment")
+	min_security_level = SEC_LEVEL_AMBER
 
 /datum/design/clusterbang_launcher_ammo
 	name = "SOB-3 Clusterbang Launcher Ammunition"
@@ -291,6 +314,7 @@
 	construction_time = 20
 	category = list("Exosuit Ammunition", "Ammo")
 	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+	min_security_level = SEC_LEVEL_AMBER
 
 /datum/design/mech_wormhole_gen
 	name = "Exosuit Module (Localized Wormhole Generator)"
@@ -411,6 +435,7 @@
 	materials = list(/datum/material/iron=10000)
 	construction_time = 100
 	category = list("Exosuit Equipment")
+	min_security_level = SEC_LEVEL_BLUE
 
 /datum/design/mech_lmg
 	name = "Exosuit Weapon (\"Ultra AC 2\" LMG)"
@@ -421,6 +446,7 @@
 	materials = list(/datum/material/iron=10000)
 	construction_time = 100
 	category = list("Exosuit Equipment")
+	min_security_level = SEC_LEVEL_RED
 
 /datum/design/mech_lmg_ammo
 	name = "Ultra AC 2 Ammunition"
@@ -432,6 +458,7 @@
 	construction_time = 20
 	category = list("Exosuit Ammunition", "Ammo")
 	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+	min_security_level = SEC_LEVEL_RED
 
 /datum/design/mech_sleeper
 	name = "Exosuit Medical Equipment (Mounted Sleeper)"
@@ -462,3 +489,52 @@
 	construction_time = 250
 	build_path = /obj/item/mecha_parts/mecha_equipment/medical/mechmedbeam
 	category = list("Exosuit Equipment")
+
+/datum/design/thrusters
+	name = "Exosuit Thrusters"
+	desc = "Реактивный двигатель для меха."
+	id = "mech_thrusters"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/mecha_equipment/thrusters
+	materials = list(/datum/material/iron=10000)
+	construction_time = 100
+	category = list("Exosuit Equipment")
+
+/datum/design/combat_mech_beacon
+	name = "Combat Mech Beacon"
+	desc = "Combat Mech Beacon"
+	id = "combat_mech_beacon"
+	build_type = PROTOLATHE
+	build_path = /obj/item/choice_beacon/pact_mecha
+	materials = list(/datum/material/iron=200000,/datum/material/gold=15000,/datum/material/uranium=15000, /datum/material/titanium=15000, /datum/material/diamond=15000)
+	construction_time = 20
+	category = list("Exosuit Modules")
+	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+	min_security_level = SEC_LEVEL_RED
+
+/datum/design/combat_mech_beacon/medical
+	name = "Medical Mech Beacon"
+	desc = "Medical Mech Beacon"
+	id = "medical_mech_beacon"
+	build_path = /obj/item/choice_beacon/pact_mecha/medical
+	materials = list(/datum/material/iron=200000,/datum/material/glass=25000, /datum/material/silver=25000)
+	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
+	min_security_level = SEC_LEVEL_BLUE
+
+/datum/design/combat_mech_beacon/cargo
+	name = "Cargo Mech Beacon"
+	desc = "Cargo Mech Beacon"
+	id = "cargo_mech_beacon"
+	build_path = /obj/item/choice_beacon/pact_mecha/cargo
+	materials = list(/datum/material/iron=200000,/datum/material/glass=25000, /datum/material/silver=25000)
+	departmental_flags = DEPARTMENTAL_FLAG_CARGO
+	min_security_level = SEC_LEVEL_BLUE
+
+/datum/design/combat_mech_beacon/engineer
+	name = "Engineer Mech Beacon"
+	desc = "Engineer Mech Beacon"
+	id = "engineer_mech_beacon"
+	build_path = /obj/item/choice_beacon/pact_mecha/engineer
+	materials = list(/datum/material/iron=200000,/datum/material/glass=25000, /datum/material/silver=25000)
+	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
+	min_security_level = SEC_LEVEL_BLUE