Merge pull request #1556 from SierraBay/dev-sierra

Merge
SierraBay · Nov 25, 2023 · b179ece · b179ece
2 parents 3c7d8b6 + d2d8b70
commit b179ece
Show file tree

Hide file tree

Showing 11 changed files with 1,709 additions and 1,373 deletions.
diff --git a/html/changelog.html b/html/changelog.html
@@ -28,6 +28,19 @@ <h2>Sierra SS13</h2>
 		-->
 		<div class="changelog">
 
+			<h2 class="date">25.11 - 2023</h2>
+			<h3 class="author">Обновления KandJX:</h3>
+			<div class="changes bgimages16">
+				<div class="log maptweak">Значительные мапфиксы.</div>
+				<div class="log tweak">ГП имеет полный доступ, кроме АВД, Капитана и Внутренних Дел.</div>
+				<div class="log tweak">Выдан доступ Research всему ЭК.</div>
+				<div class="log tweak">Выдан доступ Research Storage всему отделу РнД. Отвечает за доступы в офис и раздевалку.</div>
+				<div class="log tweak">Выдан доступ EXTERNAL информационному технику</div>
+				<div class="log maptweak">Доступ к инженерному коридору убран</div>
+				<div class="log maptweak">Доступ к коридору вокруг чекпойна СБ 4ой палубы изменен с ЭКСТЕРНАЛ, на (СБ, МЕД, ИНЖ).</div>
+				<div class="log maptweak">Охлаждение СМ теперь будет работать. Однако все равно ждём /turf/space/open от @sprtn</div>
+			</div>
+
 			<h2 class="date">24.11 - 2023</h2>
 			<h3 class="author">Обновления Kam_Survivor:</h3>
 			<div class="changes bgimages16">

diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
@@ -22469,3 +22469,36 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY sierra_genchangelog.p
       \u044F\u0442\u044C \u043F\u0430\u0441\u043F\u043E\u0440\u0442 \u0443\u043D\u0430\
       \u0442\u0438 \u043F\u0435\u0440\u0441\u043E\u043D\u0430\u0436\u0430\u043C\u0438\
       \ \u0439\u043E\u0437\u0430'\u0443\u043D\u0430\u0442\u0438"
+2023-11-25:
+  KandJX:
+  - maptweak: "\u0417\u043D\u0430\u0447\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0435\
+      \ \u043C\u0430\u043F\u0444\u0438\u043A\u0441\u044B."
+  - tweak: "\u0413\u041F \u0438\u043C\u0435\u0435\u0442 \u043F\u043E\u043B\u043D\u044B\
+      \u0439 \u0434\u043E\u0441\u0442\u0443\u043F, \u043A\u0440\u043E\u043C\u0435\
+      \ \u0410\u0412\u0414, \u041A\u0430\u043F\u0438\u0442\u0430\u043D\u0430 \u0438\
+      \ \u0412\u043D\u0443\u0442\u0440\u0435\u043D\u043D\u0438\u0445 \u0414\u0435\u043B\
+      ."
+  - tweak: "\u0412\u044B\u0434\u0430\u043D \u0434\u043E\u0441\u0442\u0443\u043F Research\
+      \ \u0432\u0441\u0435\u043C\u0443 \u042D\u041A."
+  - tweak: "\u0412\u044B\u0434\u0430\u043D \u0434\u043E\u0441\u0442\u0443\u043F Research\
+      \ Storage \u0432\u0441\u0435\u043C\u0443 \u043E\u0442\u0434\u0435\u043B\u0443\
+      \ \u0420\u043D\u0414. \u041E\u0442\u0432\u0435\u0447\u0430\u0435\u0442 \u0437\
+      \u0430 \u0434\u043E\u0441\u0442\u0443\u043F\u044B \u0432 \u043E\u0444\u0438\u0441\
+      \ \u0438 \u0440\u0430\u0437\u0434\u0435\u0432\u0430\u043B\u043A\u0443."
+  - tweak: "\u0412\u044B\u0434\u0430\u043D \u0434\u043E\u0441\u0442\u0443\u043F EXTERNAL\
+      \ \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u043E\u043D\u043D\u043E\
+      \u043C\u0443 \u0442\u0435\u0445\u043D\u0438\u043A\u0443"
+  - maptweak: "\u0414\u043E\u0441\u0442\u0443\u043F \u043A \u0438\u043D\u0436\u0435\
+      \u043D\u0435\u0440\u043D\u043E\u043C\u0443 \u043A\u043E\u0440\u0438\u0434\u043E\
+      \u0440\u0443 \u0443\u0431\u0440\u0430\u043D"
+  - maptweak: "\u0414\u043E\u0441\u0442\u0443\u043F \u043A \u043A\u043E\u0440\u0438\
+      \u0434\u043E\u0440\u0443 \u0432\u043E\u043A\u0440\u0443\u0433 \u0447\u0435\u043A\
+      \u043F\u043E\u0439\u043D\u0430 \u0421\u0411 4\u043E\u0439 \u043F\u0430\u043B\
+      \u0443\u0431\u044B \u0438\u0437\u043C\u0435\u043D\u0435\u043D \u0441 \u042D\u041A\
+      \u0421\u0422\u0415\u0420\u041D\u0410\u041B, \u043D\u0430 (\u0421\u0411, \u041C\
+      \u0415\u0414, \u0418\u041D\u0416)."
+  - maptweak: "\u041E\u0445\u043B\u0430\u0436\u0434\u0435\u043D\u0438\u0435 \u0421\
+      \u041C \u0442\u0435\u043F\u0435\u0440\u044C \u0431\u0443\u0434\u0435\u0442 \u0440\
+      \u0430\u0431\u043E\u0442\u0430\u0442\u044C. \u041E\u0434\u043D\u0430\u043A\u043E\
+      \ \u0432\u0441\u0435 \u0440\u0430\u0432\u043D\u043E \u0436\u0434\u0451\u043C\
+      \ /turf/space/open \u043E\u0442 @sprtn"
diff --git a/maps/sierra/areas/z1_sierra_deck4.dm b/maps/sierra/areas/z1_sierra_deck4.dm
@@ -1,7 +1,7 @@
 /area/hallway/primary/fourthdeck/fore
 	name = "Fourth Deck - Hallway - Fore"
 	icon_state = "hallF"
-	req_access = list(access_external_airlocks)
+	req_access = list(list(access_engine, access_medical, access_security))
 	holomap_color = HOLOMAP_AREACOLOR_HALLWAYS
 
 /area/hallway/primary/fourthdeck/center

diff --git a/maps/sierra/areas/z2_sierra_deck3.dm b/maps/sierra/areas/z2_sierra_deck3.dm
@@ -1,7 +1,6 @@
 /area/hallway/primary/thirddeck/fore
 	name = "Third Deck - Hallway - Fore"
 	icon_state = "hallF"
-	req_access = list(access_external_airlocks)
 	holomap_color = HOLOMAP_AREACOLOR_HALLWAYS
 
 /area/hallway/primary/thirddeck/center

diff --git a/maps/sierra/areas/z4_sierra_deck1.dm b/maps/sierra/areas/z4_sierra_deck1.dm
@@ -143,10 +143,12 @@
 /area/rnd/locker
 	name = "First Deck - RND - Locker Room"
 	icon_state = "locker"
+	req_access = list(access_research_storage)
 
 /area/rnd/office
 	name = "First Deck - RND - Research Office"
 	icon_state = "locker"
+	req_access = list(access_research_storage)
 
 /area/rnd/servers
 	name = "First Deck - RND - Servers"

diff --git a/maps/sierra/job/jobs_command.dm b/maps/sierra/job/jobs_command.dm
@@ -89,12 +89,13 @@
 		access_robotics, access_kitchen, access_cargo, access_construction, access_chemistry,
 		access_cargo_bot, access_hydroponics, access_library, access_virology, access_cmo,
 		access_qm, access_network, access_surgery, access_mailsorting, access_heads_vault,
-		access_ce, access_hop, access_hos, access_RC_announce, access_keycard_auth, access_tcomsat,
+		access_ce, access_rd, access_hop, access_hos, access_RC_announce, access_keycard_auth, access_tcomsat,
 		access_gateway, access_sec_doors, access_psychiatrist, access_medical_equip, access_gun,
 		access_expedition_shuttle, access_guppy, access_seneng, access_senmed, access_hangar,
 		access_guppy_helm, access_expedition_shuttle_helm, access_explorer, access_el, access_tox,
 		access_tox_storage, access_research, access_mining, access_mining_office, access_mining_station,
-		access_xenobiology, access_xenoarch, access_petrov, access_petrov_helm, access_actor
+		access_xenobiology, access_xenoarch, access_petrov, access_petrov_helm, access_actor, access_chief_steward,
+		access_bar, access_commissary, access_pilot, access_field_eng, access_field_med, access_network_admin, access_research_storage
 	)
 	software_on_spawn = list(
 		/datum/computer_file/program/comm,

diff --git a/maps/sierra/job/jobs_engineering.dm b/maps/sierra/job/jobs_engineering.dm
@@ -184,7 +184,7 @@
 	max_skill = list(   SKILL_ELECTRICAL   = SKILL_MAX,
 	                    SKILL_COMPUTER	   = SKILL_MAX)
 
-	access = list(	access_maint_tunnels, access_network,
+	access = list(	access_maint_tunnels, access_network, access_external_airlocks,
 			       	access_tech_storage, access_emergency_storage, access_tcomsat)
 
 

diff --git a/maps/sierra/job/jobs_exploration.dm b/maps/sierra/job/jobs_exploration.dm
@@ -43,7 +43,8 @@
 		access_expedition_shuttle,
 		access_expedition_shuttle_helm,
 		access_guppy,
-		access_hangar
+		access_hangar,
+		access_research
 	)
 	software_on_spawn = list(
 		/datum/computer_file/program/deck_management,
@@ -102,7 +103,8 @@
 		access_guppy_helm,
 		access_expedition_shuttle,
 		access_guppy,
-		access_hangar
+		access_hangar,
+		access_research
 	)
 	software_on_spawn = list(/datum/computer_file/program/deck_management)
 
@@ -158,7 +160,8 @@
 		access_expedition_shuttle,
 		access_guppy,
 		access_hangar,
-		access_expedition_shuttle_helm
+		access_expedition_shuttle_helm,
+		access_research
 	)
 	software_on_spawn = list(/datum/computer_file/program/deck_management)
 
@@ -212,7 +215,8 @@
 		access_guppy_helm,
 		access_expedition_shuttle,
 		access_guppy,
-		access_hangar
+		access_hangar,
+		access_research
 	)
 	software_on_spawn = list(/datum/computer_file/program/deck_management)
 
@@ -277,7 +281,8 @@
 		access_guppy_helm,
 		access_expedition_shuttle,
 		access_guppy,
-		access_hangar
+		access_hangar,
+		access_research
 	)
 	software_on_spawn = list(/datum/computer_file/program/deck_management)
 

diff --git a/maps/sierra/job/jobs_research.dm b/maps/sierra/job/jobs_research.dm
@@ -22,7 +22,8 @@
 	access = list(
 			access_tox,					access_tox_storage,	access_research,	access_mining,		access_mining_office,
 			access_mining_station,		access_xenobiology,	access_xenoarch,	access_robotics,	access_guppy_helm,
-			access_expedition_shuttle,	access_guppy,		access_hangar,		access_petrov,		access_petrov_helm
+			access_expedition_shuttle,	access_guppy,		access_hangar,		access_petrov,		access_petrov_helm,
+			access_research_storage
 		)
 
 
@@ -95,7 +96,7 @@
 	access = list(
 			access_tox,				access_tox_storage,			access_research,	access_petrov,		access_petrov_helm,
 			access_mining_office,	access_mining_station,		access_xenobiology,	access_guppy_helm, 	access_hangar,
-			access_xenoarch,		access_expedition_shuttle,	access_guppy
+			access_xenoarch,		access_expedition_shuttle,	access_guppy, access_research_storage
 		)
 
 
@@ -157,7 +158,8 @@
 	access = list(
 			access_robotics,
 			access_research,
-			access_tech_storage
+			access_tech_storage,
+			access_research_storage
 		)
 
 
@@ -205,7 +207,8 @@
 	access = list(
 			access_research,	access_mining_office,
 			access_petrov,		access_expedition_shuttle,
-			access_guppy,		access_hangar
+			access_guppy,		access_hangar,
+			access_research_storage
 		)