Merge upstream 26.01.2024 (ss220club#945)

## Что этот PR делает    ## Почему это хорошо для игры  ## Изображения изменений  ## Тестирование  ## Changelog :cl: add: Мержим оффов fix: КПБ которые умерли из-за проблем с батареей должны починить ее перед тем как "ожить" fix: Исправляет ошибку из-за которой КПБ получали от ЕМП больше урона чем планировалось fix: Исправляет потерянный спрайт у коробки с пенными гранатами fix: Возвращает спрайт мечу мультивселенной fix: Исправляет работу staff of animation(Посох который "оживляет" предметы) fix: Работа нашего кодера (Maxiemara). Исправление появления сразу нескольких аномалий S класса от СМа за раунд tweak: Способность генокрада "Восстановление плоти"(Fleshmend) стоит пять очков ДНК вместо четырех. tweak: Теперь вам не нужно пиксельхантить заменителем лампочек, достаточно нажать на любой объект на тайле с лампочкой которую вы хотите заменить fix: Теперь синди астероид защищен от радиационного шторма fix: Работа нашего кодера (DJ-34). Фикс дюпа руды, БС кристаллов и призовых билетиков. /:cl:
m-dzianishchyts · Jan 26, 2024 · 6e61e38 · 6e61e38
2 parents 4db9553 + 19433e8
commit 6e61e38
Show file tree

Hide file tree

Showing 67 changed files with 232 additions and 267 deletions.
diff --git a/_build_dependencies.sh b/_build_dependencies.sh
@@ -6,11 +6,11 @@ export NODE_VERSION=20
 # Stable Byond Major
 export STABLE_BYOND_MAJOR=515
 # Stable Byond Minor
-export STABLE_BYOND_MINOR=1628
+export STABLE_BYOND_MINOR=1630
 # Beta Byond Major
 export BETA_BYOND_MAJOR=515
 # Beta Byond Minor
-export BETA_BYOND_MINOR=1628
+export BETA_BYOND_MINOR=1630
 # Python version for mapmerge and other tools
 export PYTHON_VERSION=3.11.6
 # RUSTG version

diff --git a/code/__DEFINES/access_defines.dm b/code/__DEFINES/access_defines.dm
@@ -65,7 +65,6 @@
 #define ACCESS_XENOARCH 65
 #define ACCESS_PARAMEDIC 66
 #define ACCESS_BLUESHIELD 67
-#define ACCESS_SALVAGE_CAPTAIN 69 // Salvage ship captain's quarters
 // #define ACCESS_MECHANIC 70 // AA07 2021-10-02 - Removed: Kept for history sake
 // #define ACCESS_PILOT 71 // AA07 2021-10-02 - Removed: Kept for history sake
 #define ACCESS_NTREP 73

diff --git a/code/__DEFINES/antagonists.dm b/code/__DEFINES/antagonists.dm
diff --git a/code/__DEFINES/tools_defines.dm b/code/__DEFINES/tools_defines.dm
@@ -43,7 +43,7 @@ GLOBAL_LIST_INIT(surgery_tool_behaviors, list(
 
 //Wirecutter messages
 #define WIRECUTTER_SNIP_MESSAGE					user.visible_message("<span class='notice'>[user] cuts the wires from [src]!</span>", "<span class='notice'>You cut the wires from [src]!</span>", "<span class='warning'>You hear snipping.</span>")
-#define WIRECUTTER_ATTEMPT_DISMANTLE_MESSAGE	user.visible_message("<span class='notice'>[user] begins cutting [src] apart... </span>", "<span class='notice'>You begin cutting [src] apart...</span>", "<span class='warning'>You hear snipping.</span>")
+#define WIRECUTTER_ATTEMPT_DISMANTLE_MESSAGE	user.visible_message("<span class='notice'>[user] begins cutting [src] apart...</span>", "<span class='notice'>You begin cutting [src] apart...</span>", "<span class='warning'>You hear snipping.</span>")
 #define WIRECUTTER_DISMANTLE_SUCCESS_MESSAGE	user.visible_message("<span class='notice'>[user] cuts [src] apart!</span>", "<span class='notice'>You cut [src] apart!</span>", "<span class='warning'>You hear snipping.</span>")
 
 //Welder messages and other stuff

diff --git a/code/_onclick/click_override.dm b/code/_onclick/click_override.dm
@@ -38,8 +38,8 @@
 /datum/middleClickOverride/badminClicker/onClick(atom/A, mob/living/user)
 	var/atom/movable/newObject = new summon_path
 	newObject.loc = get_turf(A)
-	to_chat(user, "<span class='notice'>You release the power you had stored up, summoning \a [newObject.name]! </span>")
-	usr.loc.visible_message("<span class='notice'>[user] waves [user.p_their()] hand and summons \a [newObject.name]</span>")
+	to_chat(user, "<span class='notice'>You release the power you had stored up, summoning \a [newObject.name]!</span>")
+	usr.loc.visible_message("<span class='notice'>[user] waves [user.p_their()] hand and summons \a [newObject.name]!</span>")
 	..()
 
 /datum/middleClickOverride/shock_implant

diff --git a/code/controllers/subsystem/SSjobs.dm b/code/controllers/subsystem/SSjobs.dm
@@ -42,7 +42,7 @@ SUBSYSTEM_DEF(jobs)
 	occupations = list()
 	var/list/all_jobs = subtypesof(/datum/job)
 	if(!all_jobs.len)
-		to_chat(world, "<span class='warning'>Error setting up jobs, no job datums found</span>")
+		to_chat(world, "<span class='warning'>Error setting up jobs, no job datums found.</span>")
 		return 0
 
 	for(var/J in all_jobs)

diff --git a/code/controllers/subsystem/tickets/tickets.dm b/code/controllers/subsystem/tickets/tickets.dm
@@ -252,14 +252,14 @@ SUBSYSTEM_DEF(tickets)
 			C.man_up(returnClient(N))
 			T.lastStaffResponse = "Autoresponse: [message_key]"
 			resolveTicket(N)
-			message_staff("[C] has auto responded to [ticket_owner]\'s adminhelp with:<span class='adminticketalt'> [message_key] </span>")
+			message_staff("[C] has auto responded to [ticket_owner]\'s adminhelp with:<span class='adminticketalt'> [message_key]</span>")
 			log_game("[C] has auto responded to [ticket_owner]\'s adminhelp with: [response_phrases[message_key]]")
 		if("Mentorhelp")
 			convert_ticket(T)
 		else
 			SEND_SOUND(returnClient(N), sound('sound/effects/adminhelp.ogg'))
 			to_chat_safe(returnClient(N), "<span class='[span_class]'>[key_name_hidden(C)] is autoresponding with: <span/> <span class='adminticketalt'>[response_phrases[message_key]]</span>")//for this we want the full value of whatever key this is to tell the player so we do response_phrases[message_key]
-			message_staff("[C] has auto responded to [ticket_owner]\'s adminhelp with:<span class='adminticketalt'> [message_key] </span>") //we want to use the short named keys for this instead of the full sentence which is why we just do message_key
+			message_staff("[C] has auto responded to [ticket_owner]\'s adminhelp with:<span class='adminticketalt'> [message_key]</span>") //we want to use the short named keys for this instead of the full sentence which is why we just do message_key
 			T.lastStaffResponse = "Autoresponse: [message_key]"
 			resolveTicket(N)
 			log_game("[C] has auto responded to [ticket_owner]\'s adminhelp with: [response_phrases[message_key]]")

diff --git a/code/datums/action.dm b/code/datums/action.dm
@@ -445,7 +445,7 @@
 
 /datum/action/item_action/instrument
 	name = "Use Instrument"
-	desc = "Use the instrument specified"
+	desc = "Use the instrument specified."
 
 /datum/action/item_action/instrument/Trigger(left_click)
 	if(istype(target, /obj/item/instrument))
@@ -551,7 +551,7 @@
 
 /datum/action/item_action/accessory/herald
 	name = "Mirror Walk"
-	desc = "Use near a mirror to enter it"
+	desc = "Use near a mirror to enter it."
 
 //Preset for spells
 /datum/action/spell_action

diff --git a/code/datums/dog_fashion.dm b/code/datums/dog_fashion.dm
@@ -177,7 +177,7 @@
 
 /datum/dog_fashion/head/sombrero
 	name = "Segnor REAL_NAME"
-	desc = "You must respect Elder Dogname"
+	desc = "You must respect Elder Dogname."
 
 /datum/dog_fashion/head/sombrero/New(mob/M)
 	..()
@@ -211,7 +211,7 @@
 
 /datum/dog_fashion/head/cone
 	name = "REAL_NAME"
-	desc = "Omnicone's Chosen Champion"
+	desc = "Omnicone's Chosen Champion."
 
 /datum/dog_fashion/back/hardsuit
 	name = "Space Explorer REAL_NAME"

diff --git a/code/datums/emote.dm b/code/datums/emote.dm
@@ -531,7 +531,7 @@
 			return FALSE
 		if(!check_rights(R_ADMIN, FALSE, user))
 			if(!GLOB.dsay_enabled)
-				to_chat(user, "<span class='warning'>Deadchat is globally muted</span>")
+				to_chat(user, "<span class='warning'>Deadchat is globally muted.</span>")
 				return FALSE
 
 /**

diff --git a/code/datums/station_traits/neutral_traits.dm b/code/datums/station_traits/neutral_traits.dm
@@ -2,14 +2,14 @@
 	name = "Bananium Shipment"
 	trait_type = STATION_TRAIT_NEUTRAL
 	weight = 5
-	report_message = "Rumor has it that the clown planet has been sending support packages to clowns in this system."
+	report_message = "An unidentified benefactor has dispatched a mysterious shipment to your station's clown. It was reported to smell faintly of bananas."
 	trait_to_give = STATION_TRAIT_BANANIUM_SHIPMENTS
 
 /datum/station_trait/bananium_shipment
 	name = "Tranquilite Shipment"
 	trait_type = STATION_TRAIT_NEUTRAL
 	weight = 5
-	report_message = "Rumor has it that the mime federation has been sending support packages to mimes in this system."
+	report_message = "Shipping records show an unmarked crate being delivered to your station's mime."
 	trait_to_give = STATION_TRAIT_TRANQUILITE_SHIPMENTS
 
 /datum/station_trait/unique_ai

diff --git a/code/datums/weather/weather_types/radiation_storm.dm b/code/datums/weather/weather_types/radiation_storm.dm
@@ -27,6 +27,7 @@
 		/area/station/security/brig,
 		/area/shuttle,
 		/area/survivalpod, //although survivalpods are off-station, creating one on station no longer protects pods on station from the rad storm
+		/area/syndicate_depot/core, // exterior of depot still dangerous, gotta be inside
 		/area/ruin, //Let us not completely kill space explorers.
 		/area/station/command/server
 	)

diff --git a/code/game/area/shuttle_areas.dm b/code/game/area/shuttle_areas.dm
@@ -234,63 +234,6 @@
 /area/shuttle/research/outpost
 	icon_state = "shuttle"
 
-/area/shuttle/salvage
-	name = "\improper Salvage Ship"
-	icon_state = "yellow"
-
-/area/shuttle/salvage/start
-	name = "\improper Middle of Nowhere"
-	icon_state = "yellow"
-
-/area/shuttle/salvage/arrivals
-	name = "\improper Space Station Auxiliary Docking"
-	icon_state = "yellow"
-
-/area/shuttle/salvage/derelict
-	name = "\improper Derelict Station"
-	icon_state = "yellow"
-
-/area/shuttle/salvage/djstation
-	name = "\improper Ruskie DJ Station"
-	icon_state = "yellow"
-
-/area/shuttle/salvage/north
-	name = "\improper North of the Station"
-	icon_state = "yellow"
-
-/area/shuttle/salvage/east
-	name = "\improper East of the Station"
-	icon_state = "yellow"
-
-/area/shuttle/salvage/south
-	name = "\improper South of the Station"
-	icon_state = "yellow"
-
-/area/shuttle/salvage/commssat
-	name = "\improper The Communications Satellite"
-	icon_state = "yellow"
-
-/area/shuttle/salvage/mining
-	name = "\improper South-West of the Mining Asteroid"
-	icon_state = "yellow"
-
-/area/shuttle/salvage/abandoned_ship
-	name = "\improper Abandoned Ship"
-	icon_state = "yellow"
-	parallax_movedir = WEST
-
-/area/shuttle/salvage/clown_asteroid
-	name = "\improper Clown Asteroid"
-	icon_state = "yellow"
-
-/area/shuttle/salvage/trading_post
-	name = "\improper Trading Post"
-	icon_state = "yellow"
-
-/area/shuttle/salvage/transit
-	name = "\improper hyperspace"
-	icon_state = "shuttle"
-
 /area/shuttle/supply
 	name = "Supply Shuttle"
 	icon_state = "shuttle3"

diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm
@@ -503,6 +503,7 @@
 	holder.icon_state = "hudjani"
 	holder.alpha = 130
 	holder.plane = ABOVE_LIGHTING_PLANE
+	holder.appearance_flags = RESET_COLOR | RESET_ALPHA | RESET_TRANSFORM
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	I'll just put this somewhere near the end...

diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
@@ -369,7 +369,7 @@ structure_check() searches for nearby cultist structures required for the invoca
 
 			var/obj/item/melee/cultblade/dagger/D = new(get_turf(src))
 			if(H.equip_to_slot_if_possible(D, SLOT_HUD_IN_BACKPACK, FALSE, TRUE))
-				to_chat(H, "<span class='cultlarge'>You have a dagger in your backpack. Use it to do [SSticker.cultdat.entity_title1]'s bidding. </span>")
+				to_chat(H, "<span class='cultlarge'>You have a dagger in your backpack. Use it to do [SSticker.cultdat.entity_title1]'s bidding.</span>")
 			else
 				to_chat(H, "<span class='cultlarge'>There is a dagger on the floor. Use it to do [SSticker.cultdat.entity_title1]'s bidding.</span>")
 

diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
@@ -506,7 +506,7 @@ Congratulations! You are now trained for invasive xenobiology research!"}
 		add_attack_logs(user, L, "Put to sleep with [src]")
 	else
 		L.AdjustDrowsy(2 SECONDS)
-		to_chat(user, "<span class='warning'>Sleep inducement works fully only on stunned specimens! </span>")
+		to_chat(user, "<span class='warning'>Sleep inducement works fully only on stunned specimens!</span>")
 		L.visible_message("<span class='danger'>[user] tried to induce sleep in [L] with [src]!</span>", \
 							"<span class='userdanger'>You suddenly feel drowsy!</span>")
 

diff --git a/code/game/gamemodes/miniantags/demons/slaughter demon/slaughter.dm b/code/game/gamemodes/miniantags/demons/slaughter demon/slaughter.dm
@@ -244,7 +244,7 @@
 
 	// Eating a 2nd heart. Gives the ability to drag people into blood and eat them.
 	if(HAS_TRAIT(user, TRAIT_BLOODCRAWL))
-		to_chat(user, "You feel differ-<span class = 'danger'> CONSUME THEM! </span>")
+		to_chat(user, "You feel differ-<span class='danger'> CONSUME THEM!</span>")
 		ADD_TRAIT(user, TRAIT_BLOODCRAWL_EAT, "bloodcrawl_eat")
 		qdel(src) // Replacing their demon heart with another demon heart is pointless, just delete this one and return.
 		return TRUE

diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm
@@ -76,7 +76,7 @@
 		return
 
 	if(used)
-		to_chat(user, "<span class='warning'> You've already summoned an apprentice or you are in process of summoning one. </span>")
+		to_chat(user, "<span class='warning'>You've already summoned an apprentice or you are in process of summoning one.</span>")
 		return
 
 	ui_interact(user)
@@ -322,6 +322,7 @@ GLOBAL_LIST_EMPTY(multiverse)
 /obj/item/multisword
 	name = "multiverse sword"
 	desc = "A weapon capable of conquering the universe and beyond. Activate it to summon copies of yourself from others dimensions to fight by your side."
+	icon = 'icons/obj/energy_melee.dmi'
 	lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
 	icon_state = "energy_katana"
@@ -707,6 +708,7 @@ GLOBAL_LIST_EMPTY(multiverse)
 /obj/item/multisword/pike //If We are to be used and spent, let it be for a noble purpose.
 	name = "phantom pike"
 	desc = "A fishing pike that appears to be imbued with a peculiar energy."
+	icon = 'icons/obj/items.dmi'
 	icon_state = "harpoon"
 	item_state = "harpoon"
 	cooldown_between_uses = 200 //Half the time

diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm
@@ -199,7 +199,7 @@
 									and the memories of your time as their servant with it.</span>")
 						to_chat(M, "<span class='danger'>Assist [user], your saviour, and get vengeance on those who enslaved you!</span>")
 					else
-						to_chat(M, "<span class='danger'>Your soulstone has been exorcised, and you are now bound to obey [user]. </span>")
+						to_chat(M, "<span class='danger'>Your soulstone has been exorcised, and you are now bound to obey [user].</span>")
 
 			for(var/mob/living/simple_animal/shade/EX in src)
 				EX.holy = TRUE

diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm
@@ -144,7 +144,7 @@
 	return list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER, ACCESS_SYNDICATE_COMMAND)
 
 /proc/get_all_misc_access()
-	return list(ACCESS_SALVAGE_CAPTAIN, ACCESS_TRADE_SOL, ACCESS_CRATE_CASH, ACCESS_AWAY01)
+	return list(ACCESS_TRADE_SOL, ACCESS_CRATE_CASH, ACCESS_AWAY01)
 
 /proc/get_absolutely_all_accesses()
 	return (get_all_accesses() | get_all_centcom_access() | get_all_syndicate_access() | get_all_misc_access())

diff --git a/code/game/machinery/airlock_control/airlock_controllers.dm b/code/game/machinery/airlock_control/airlock_controllers.dm
@@ -105,7 +105,7 @@
 	add_fingerprint(usr)
 
 	if(!allowed(usr))
-		to_chat(usr, "<span class='warning'>Access denied</span>")
+		to_chat(usr, "<span class='warning'>Access denied.</span>")
 		return TRUE
 
 	switch(action)

diff --git a/code/game/machinery/computer/arcade_games/recruiter.dm b/code/game/machinery/computer/arcade_games/recruiter.dm
@@ -55,7 +55,7 @@
 							"Spent 2 years as a freelance journalist", "Known as a hero for keeping stations clean during attacks",
 							"Worked as a bureaucrat for SolGov", "Worked in Donk Corporation's R&D department",
 							"Did work for USSP as an translator", "Took care of Toxins, Xenobiology, Robotics and R&D as a single worker in the Research department",
-							"Served for 4 years as a soldier of the Prospero Order", "Traveled through various systems as an businessman",
+							"Served for 4 years as a soldier of the Prospero Order", "Traveled through various systems as a businessman",
 							"Worked as a waiter for one year", "Has previous experience as a cameraman",
 							"Spent years of their life being a janitor at Clown College", "Was given numerous good reviews for delivering cargo requests on time",
 							"Helped old people cross the holostreet", "Has proven ability to read", "Served 4 years in NT navy",

diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
@@ -547,7 +547,7 @@
 			format_board_name()
 			to_chat(user, "<span class='notice'>Access protocols set to [console_choice].</span>")
 		else
-			to_chat(user, "<span class='warning'>Access Denied</span>")
+			to_chat(user, "<span class='warning'>Access Denied.</span>")
 		return
 	return ..()
 

diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm
@@ -227,17 +227,18 @@
 	else
 		return 0
 
-/obj/item/lightreplacer/afterattack(atom/T, mob/U, proximity)
+/obj/item/lightreplacer/afterattack(atom/target_turf, mob/U, proximity)
 	. = ..()
 	if(!proximity && !bluespace_toggle)
 		return
-	if(!isturf(T))
+	var/turf/replace_turf = get_turf(target_turf)
+	if(!istype(replace_turf))
 		return
-	if(get_dist(src, T) >= (U.client.maxview() + 2)) // To prevent people from using it over cameras
+	if(get_dist(src, target_turf) >= (U.client.maxview() + 2)) // To prevent people from using it over cameras
 		return
 
 	var/used = FALSE
-	for(var/atom/A in T)
+	for(var/atom/A in replace_turf)
 		if(!CanUse(U))
 			break
 		used = TRUE