Merge pull request #190 from Proxima-Project/update

Update
Proxima-Project · Jul 2, 2023 · ec915ed · ec915ed
2 parents 105d403 + fb312e5
commit ec915ed
Show file tree

Hide file tree

Showing 89 changed files with 15,076 additions and 2,057 deletions.
diff --git a/baystation12.dme b/baystation12.dme
@@ -187,6 +187,7 @@
 #include "code\bos\game\objects\items\shooting_range.dm"
 #include "code\bos\game\objects\items\toys.dm"
 #include "code\bos\game\objects\items\wallet.dm"
+#include "code\bos\game\objects\items\devices\radio.dm"
 #include "code\bos\game\objects\items\devices\spy_sensor.dm"
 #include "code\bos\game\objects\items\devices\syndietele.dm"
 #include "code\bos\game\objects\items\devices\virus_sampler.dm"
@@ -196,6 +197,7 @@
 #include "code\bos\game\objects\items\weapons\implants\implants\emp.dm"
 #include "code\bos\game\objects\items\weapons\implants\implants\fake_death.dm"
 #include "code\bos\game\objects\items\weapons\implants\implants\spying.dm"
+#include "code\bos\game\objects\items\weapons\storage\boxes.dm"
 #include "code\bos\game\objects\items\weapons\storage\mgsbox.dm"
 #include "code\bos\game\objects\items\weapons\storage\snb.dm"
 #include "code\bos\game\objects\items\weapons\storage\uplink_kits.dm"
@@ -238,6 +240,7 @@
 #include "code\bos\modules\clothing\hats\hat.dm"
 #include "code\bos\modules\clothing\hats\kgb_hat.dm"
 #include "code\bos\modules\clothing\hats\sombrero.dm"
+#include "code\bos\modules\clothing\mask\booker_face.dm"
 #include "code\bos\modules\clothing\suit\blazer.dm"
 #include "code\bos\modules\clothing\suit\booker.dm"
 #include "code\bos\modules\clothing\suit\cyberpunk_overcoat.dm"

diff --git a/code/__defines/colors.dm b/code/__defines/colors.dm
@@ -110,7 +110,7 @@
 #define	COMMS_COLOR_SECURITY_I "#935050"
 #define	COMMS_COLOR_COMMAND    "#204090"
 #define	COMMS_COLOR_CENTCOMM   "#5c5c7c"
-#define	COMMS_COLOR_SYNDICATE  "#6d3f40"
+#define	COMMS_COLOR_SYNDICATE  "#008000"
 #define	COMMS_COLOR_SKRELL     "#7331c4"
 #define COMMS_COLOR_VOX        "#f32b06"
 #define COMMS_COLOR_BEARCAT    "#590e2d"

diff --git a/code/__defines/culture.dm b/code/__defines/culture.dm
@@ -34,11 +34,12 @@
 #define FACTION_LARMARINES		"Marine Corps"
 #define FACTION_KGB				"Galactic Security Corps"
 
+//OTHER BASTARDS (BOS)
 #define FACTION_LRA				"Patriot Association"
 #define FACTION_SYNDI			"Syndicate"
 #define FACTION_NONE			"Independent"
-
 #define FACTION_REGS			"Regulators"
+#define FACTION_ALI				"Alliance"
 
 #define HOME_SYSTEM_EARTH      "Earth"
 #define HOME_SYSTEM_LUNA       "Luna"

diff --git a/code/_helpers/mobs.dm b/code/_helpers/mobs.dm
@@ -201,23 +201,23 @@
 	if (. && do_feedback)
 		switch (.)
 			if (DO_MISSING_TARGET)
-				to_chat(user, SPAN_WARNING("\The [target] no longer exists!"))
+				to_chat(user, SPAN_WARNING("[target] больше не существует!"))
 			if (DO_INCAPACITATED)
-				to_chat(user, SPAN_WARNING("You're no longer able to act!"))
+				to_chat(user, SPAN_WARNING("Вы бесполезны!"))
 			if (DO_USER_CAN_MOVE)
-				to_chat(user, SPAN_WARNING("You must remain still to perform that action!"))
+				to_chat(user, SPAN_WARNING("Не двигайся, ты делаешь что-то!"))
 			if (DO_TARGET_CAN_MOVE)
-				to_chat(user, SPAN_WARNING("\The [target] must remain still to perform that action!"))
+				to_chat(user, SPAN_WARNING("[target] стоит перестать вертеться!"))
 			if (DO_USER_CAN_TURN)
-				to_chat(user, SPAN_WARNING("You must face the same direction to perform that action!"))
+				to_chat(user, SPAN_WARNING("Смотри в ту же сторону!"))
 			if (DO_TARGET_CAN_TURN)
-				to_chat(user, SPAN_WARNING("\The [target] must face the same direction to perform that action!"))
+				to_chat(user, SPAN_WARNING("[target] стоит смотреть в ту же сторону!"))
 			if (DO_USER_SAME_HAND)
-				to_chat(user, SPAN_WARNING("You must remain on the same active hand to perform that action!"))
+				to_chat(user, SPAN_WARNING("Не размахивай руками!"))
 			if (DO_USER_UNIQUE_ACT)
-				to_chat(user, SPAN_WARNING("You stop what you're doing with \the [target]."))
+				to_chat(user, SPAN_WARNING("Ты перестаёшь беспокоить [target]."))
 			if (DO_USER_SAME_ZONE)
-				to_chat(user, SPAN_WARNING("You must remain targeting the same zone to perform that action!"))
+				to_chat(user, SPAN_WARNING("Целься в ту же конечность!"))
 
 	if (bar)
 		qdel(bar)

diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm
@@ -85,8 +85,8 @@
 #define ui_nutrition "EAST-1:28,CENTER-2:11"
 #define ui_nutrition_small "EAST-1:28,CENTER-2:24"
 #define ui_temp "EAST-1:28,CENTER-1:13"
-#define ui_health "EAST-1:28,CENTER:15"
-#define ui_internal "EAST-1:28,CENTER+1:17"
+#define ui_internal "EAST-1:28,CENTER:15"
+#define ui_health "EAST-1:28,CENTER+1:17"
 									//borgs
 #define ui_borg_health "EAST-1:28,CENTER-1:13" //borgs have the health display where humans have the pressure damage indicator.
 #define ui_alien_health "EAST-1:28,CENTER-1:13" //aliens have the health display where humans have the pressure damage indicator.

diff --git a/code/bos/game/objects/items/devices/radio.dm b/code/bos/game/objects/items/devices/radio.dm
@@ -0,0 +1,82 @@
+/obj/item/device/radio/utility
+	name = "silenced walkie-talkie"
+	desc = "A silenced radio can only be heard by the person holding it, and it uses three times less power"
+	icon = 'icons/bos/obj/radio.dmi'
+	icon_state = "utility"
+	item_state = "utility"
+	power_usage = 5
+	canhear_range = 0
+
+/obj/item/device/radio/utility/sec
+	name = "silenced security walkie-talkie"
+	icon_state = "utility_sec"
+	item_state = "utility_sec"
+	frequency = SEC_FREQ
+
+/obj/item/device/radio/utility/eng
+	name = "silenced engineering walkie-talkie"
+	icon_state = "utility_eng"
+	item_state = "utility_eng"
+	frequency = ENG_FREQ
+
+/obj/item/device/radio/utility/com
+	name = "silenced command walkie-talkie"
+	icon_state = "utility_com"
+	item_state = "utility_com"
+	frequency = COMM_FREQ
+
+/obj/item/device/radio/utility/sup
+	name = "silenced supply walkie-talkie"
+	icon_state = "utility_sup"
+	item_state = "utility_sup"
+	frequency = SUP_FREQ
+
+/obj/item/device/radio/utility/srv
+	name = "silenced service walkie-talkie"
+	icon_state = "utility_srv"
+	item_state = "utility_srv"
+	frequency = SRV_FREQ
+
+/obj/item/device/radio/utility/med
+	name = "silenced medical walkie-talkie"
+	icon_state = "utility_med"
+	item_state = "utility_med"
+	frequency = MED_FREQ
+
+/obj/item/device/radio/robust
+	name = "robust radio"
+	icon = 'icons/bos/obj/radio.dmi'
+	icon_state = "big"
+	item_state = "big"
+	power_usage = 1
+	w_class = ITEM_SIZE_HUGE
+
+/obj/item/device/radio/robust/sec
+	name = "security robust radio"
+	icon_state = "big_sec"
+	item_state = "big_sec"
+	frequency = SEC_FREQ
+
+/obj/item/device/radio/robust/eng
+	name = "engineering robust radio"
+	icon_state = "big_eng"
+	item_state = "big_eng"
+	frequency = ENG_FREQ
+
+/obj/item/device/radio/robust/com
+	name = "command robust radio"
+	icon_state = "big_com"
+	item_state = "big_com"
+	frequency = COMM_FREQ
+
+/obj/item/device/radio/robust/sup
+	name = "supply robust radio"
+	icon_state = "big_sup"
+	item_state = "big_sup"
+	frequency = SUP_FREQ
+
+/obj/item/device/radio/robust/med
+	name = "medical robust radio"
+	icon_state = "big_med"
+	item_state = "big_med"
+	frequency = MED_FREQ
diff --git a/code/bos/game/objects/items/weapons/storage/boxes.dm b/code/bos/game/objects/items/weapons/storage/boxes.dm
@@ -0,0 +1,29 @@
+/obj/item/storage/box/radio
+	name = "box of common radios"
+	desc = "A box of spare walkie talkies."
+	startswith = list(/obj/item/device/radio/utility = 7)
+
+/obj/item/storage/box/radio/supply
+	name = "box of supply radios"
+	desc = "A box of spare walkie talkies. This one labeled 'SUP'."
+	startswith = list(/obj/item/device/radio/utility/sup = 7)
+
+/obj/item/storage/box/radio/command
+	name = "box of command radios"
+	desc = "A box of spare walkie talkies. This one labeled 'COM'."
+	startswith = list(/obj/item/device/radio/utility/com = 7)
+
+/obj/item/storage/box/radio/engineering
+	name = "box of engineering radios"
+	desc = "A box of spare walkie talkies. This one labeled 'ENG'."
+	startswith = list(/obj/item/device/radio/utility/eng = 7)
+
+/obj/item/storage/box/radio/security
+	name = "box of security radios"
+	desc = "A box of spare walkie talkies. This one labeled 'SEC'."
+	startswith = list(/obj/item/device/radio/utility/sec = 7)
+
+/obj/item/storage/box/radio/medical
+	name = "box of medical radios"
+	desc = "A box of spare walkie talkies. This one labeled 'MED'."
+	startswith = list(/obj/item/device/radio/utility/med = 7)
diff --git a/code/bos/game/objects/random/random.dm b/code/bos/game/objects/random/random.dm
@@ -69,6 +69,22 @@
 				/obj/item/storage/fancy/supply_box/grenade,
 				/obj/item/storage/fancy/supply_box/flashlight)
 
+/obj/random/good_tools
+	name = "random tools and tech"
+	desc = "This is a random tool."
+	icon = 'icons/obj/tools.dmi'
+	icon_state = "welder"
+
+/obj/random/good_tools/spawn_choices()
+	return list(/obj/item/weldingtool/largetank,
+				/obj/item/device/flashlight/upgraded,
+				/obj/item/cell/high,
+				/obj/item/cell/super,
+				/obj/item/cell/hyper,
+				/obj/item/storage/toolbox/syndicate,
+				/obj/item/stack/telecrystal,
+				/obj/item/gun/energy/retro)
+
 
 ////
 // MOBS

diff --git a/code/bos/modules/clothing/mask/booker_face.dm b/code/bos/modules/clothing/mask/booker_face.dm
@@ -0,0 +1,9 @@
+/obj/item/clothing/mask/gas/swat/booker
+	name = "Boris Booker mask"
+	desc = "A mask in the likeness of Boris Booker's face. It is surprisingly strong and works like a gas mask."
+	icon = 'icons/bos/obj/clothing/obj_face.dmi'
+	item_icons = list(slot_wear_mask_str = 'icons/bos/mob/onmob/onmob_face.dmi')
+	icon_state = "booker"
+	item_state = "booker"
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR
+	body_parts_covered = HEAD|FACE|EYES
diff --git a/code/bos/modules/culture_descriptor/faction/factions_human.dm b/code/bos/modules/culture_descriptor/faction/factions_human.dm
@@ -59,4 +59,13 @@
 	Находится под негласно гласным контролем криминальных лордов, менеджеров Синдиката, отставных военных преступников и продажных политиков, сделавших себе 'честное имя' после разгрома ЦПСС, \
 	из-за чего зачастую в среду Солдатов Удачи попадает контингент нищих, мрачных культистов, мутантов, нео-хиппи, преступников и прочих отбросов общества. \
 	Исправно занимает место победителя во всех списках худших работодателей среди ЧВК."
+	economic_power = 0.8
+
+/decl/cultural_info/faction/alliance
+	name = FACTION_ALI
+	description = "Альянс Человечества – международная организация, установившая надзор за коллективной безопасностью человеческого пространства. \
+	Управляемая самыми практичными и беспринципными элитами из числа государств-гегемонов, члены Альянса ставят перед собой цель удержать расстановку сил в галактике так, как она есть, \
+	оказывая сопротивление революционерам, националистам, слишком либеральным и слишком консервативным группам.  \
+	Альянс выступает как третейский судья в спорах между государствами, авторизует применение оружия массового поражения, использует карательные отряды для сохранения законов на подмандатных территориях. \
+	Если Ваш персонаж принадлежит к Альянсу, то он скорее всего является эмиссаром миротворческой миссии, цепным псом альянсовских силовиков или просто гражданином-ревнителем, кому близки идеи объединения человечества и ненависть ко всем радикалам."
 	economic_power = 1
diff --git a/code/controllers/communications.dm b/code/controllers/communications.dm
@@ -175,8 +175,8 @@ var/global/list/radiochannels = list(
 	"Medical (I)"	= MED_I_FREQ,
 	"Security (I)"	= SEC_I_FREQ,
 	"Recon"			= SKRELL_FREQ, //boh,
-	"Terran"		= TERR_FREQ,
-	"SCG Fleet"		= SOL_FREQ
+	"Terran"		= TERR_FREQ, //bos
+	"SCG Fleet"		= SOL_FREQ //bos
 )
 
 var/global/list/channel_color_presets = list(

diff --git a/code/game/world.dm b/code/game/world.dm
@@ -128,7 +128,9 @@ GLOBAL_VAR(href_logfile)
 		"Кровавая миля",
 		"На фронтире без перемен",
 		"Ересь Букера",
-		"Санитары пустыни"
+		"Санитары пустыни",
+		"Кровь и форон",
+		"Прежде чем их повесят"
 	)
 	name = "[server_name] - [pick(name_titles)]"
 

diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
@@ -1411,6 +1411,7 @@ GLOBAL_VAR_INIT(skip_allow_lists, FALSE)
 	message_admins("<span class='adminnotice'>[key_name_admin(usr)] has put [frommob.ckey] in control of [tomob.name].</span>")
 	log_admin("[key_name(usr)] stuffed [frommob.ckey] into [tomob.name].")
 	tomob.ckey = frommob.ckey
+	tomob.teleop = null
 	qdel(frommob)
 	return 1
 

diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
@@ -158,6 +158,8 @@
 	log_and_message_admins("assumed direct control of [M].")
 	var/mob/adminmob = src.mob
 	M.ckey = src.ckey
+	M.teleop = null
+	adminmob.teleop = null
 	if(isghost(adminmob))
 		qdel(adminmob)
 

diff --git a/code/modules/client/preference_setup/global/01_ui.dm b/code/modules/client/preference_setup/global/01_ui.dm
@@ -1,10 +1,10 @@
 /datum/preferences
-	var/clientfps = 40
+	var/clientfps = 200
 	var/ooccolor = "#010000" //Whatever this is set to acts as 'reset' color and is thus unusable as an actual custom color
 
-	var/UI_style = "Midnight"
+	var/UI_style = "Bastion" //bos
 	var/UI_style_color = "#ffffff"
-	var/UI_style_alpha = 255
+	var/UI_style_alpha = 230 //bos
 
 /datum/category_item/player_setup_item/player_global/ui
 	name = "UI"

diff --git a/code/modules/client/preference_setup/preference_setup.dm b/code/modules/client/preference_setup/preference_setup.dm
@@ -5,13 +5,13 @@
 var/global/const/CHARACTER_PREFERENCE_INPUT_TITLE = "Character Preference"
 
 /datum/category_group/player_setup_category/physical_preferences
-	name = "Physical"
+	name = "Персонаж"
 	sort_order = 1
 	item_wrap_index = 2
 	category_item_type = /datum/category_item/player_setup_item/physical
 
 /datum/category_group/player_setup_category/background_preferences
-	name = "Background"
+	name = "Предыстория"
 	sort_order = 2
 	category_item_type = /datum/category_item/player_setup_item/background
 
@@ -21,27 +21,27 @@ var/global/const/CHARACTER_PREFERENCE_INPUT_TITLE = "Character Preference"
 		. += "[player_setup_item.content(user)]<br>"
 
 /datum/category_group/player_setup_category/occupation_preferences
-	name = "Occupation"
+	name = "Роли"
 	sort_order = 3
 	category_item_type = /datum/category_item/player_setup_item/occupation
 
 /datum/category_group/player_setup_category/appearance_preferences
-	name = "Roles"
+	name = "Антагонисты"
 	sort_order = 4
 	category_item_type = /datum/category_item/player_setup_item/antagonism
 
 /datum/category_group/player_setup_category/loadout_preferences
-	name = "Loadout"
+	name = "Снаряжение"
 	sort_order = 6
 	category_item_type = /datum/category_item/player_setup_item/loadout
 
 /datum/category_group/player_setup_category/global_preferences
-	name = "Global"
+	name = "Настройки"
 	sort_order = 7
 	category_item_type = /datum/category_item/player_setup_item/player_global
 
 /datum/category_group/player_setup_category/law_pref
-	name = "Laws"
+	name = "Синтетики"
 	sort_order = 8
 	category_item_type = /datum/category_item/player_setup_item/law_pref
 

diff --git a/code/modules/client/ui_style.dm b/code/modules/client/ui_style.dm
@@ -1,18 +1,19 @@
 
 
 var/global/all_ui_styles = list(
-	"Midnight"     = 'icons/mob/screen/midnight.dmi',
+	"Bastion"     = 'icons/mob/screen/bastion.dmi' //bos
+/*	"Midnight"     = 'icons/mob/screen/midnight.dmi',
 	"Orange"       = 'icons/mob/screen/orange.dmi',
 	"old"          = 'icons/mob/screen/old.dmi',
 	"White"        = 'icons/mob/screen/white.dmi',
 	"old-noborder" = 'icons/mob/screen/old-noborder.dmi',
-	"minimalist"   = 'icons/mob/screen/minimalist.dmi'
+	"minimalist"   = 'icons/mob/screen/minimalist.dmi'*/
 	)
 
 /proc/ui_style2icon(ui_style)
 	if(ui_style in all_ui_styles)
 		return all_ui_styles[ui_style]
-	return all_ui_styles["White"]
+	return all_ui_styles["Bastion"] //bos
 
 
 /client/verb/change_ui()

diff --git a/code/modules/goonchat/browserassets/css/browserOutput.css b/code/modules/goonchat/browserassets/css/browserOutput.css
@@ -296,7 +296,7 @@ em						{font-style: normal;	font-weight: bold;}
 
 /* Radio Channels */
 .comradio				{color: #193a7a;}
-.syndradio				{color: #6d3f40;}
+.syndradio				{color: #1ecc43;}
 .centradio				{color: #5c5c8a;}
 .airadio				{color: #ff00ff;}
 .entradio				{color: #339966;}

diff --git a/code/modules/goonchat/browserassets/css/browserOutput_white.css b/code/modules/goonchat/browserassets/css/browserOutput_white.css
@@ -293,7 +293,7 @@ em						{font-style: normal;font-weight: bold;}
 
 /* Radio Channels */
 .comradio				{color: #193a7a;}
-.syndradio				{color: #6d3f40;}
+.syndradio				{color: #008000;}
 .centradio				{color: #5c5c8a;}
 .airadio				{color: #ff00ff;}
 .entradio				{color: #339966;}