Merge branch 'master' into translate

ss220club · Feb 20, 2024 · dc8d686 · dc8d686
2 parents ecc589b + ad506e6
commit dc8d686
Show file tree

Hide file tree

Showing 42 changed files with 297 additions and 308 deletions.
diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
diff --git a/code/controllers/subsystem/SSjobs.dm b/code/controllers/subsystem/SSjobs.dm
@@ -638,7 +638,7 @@ SUBSYSTEM_DEF(jobs)
 
 //fuck
 /datum/controller/subsystem/jobs/proc/CreateMoneyAccount(mob/living/H, rank, datum/job/job)
-	if(!job.has_bank_account)
+	if(job && !job.has_bank_account)
 		return
 	var/starting_balance = job?.department_account_access ? COMMAND_MEMBER_STARTING_BALANCE : CREW_MEMBER_STARTING_BALANCE
 	var/datum/money_account/account = GLOB.station_money_database.create_account(H.real_name, starting_balance, ACCOUNT_SECURITY_ID, "NAS Trurl Accounting", TRUE)

diff --git a/code/datums/diseases/_MobProcs.dm b/code/datums/diseases/_MobProcs.dm
@@ -2,9 +2,9 @@
 /mob/proc/HasDisease(datum/disease/D)
 	for(var/thing in viruses)
 		var/datum/disease/DD = thing
-		if(D.IsSame(DD))
-			return 1
-	return 0
+		if(DD.IsSame(D))
+			return TRUE
+	return FALSE
 
 
 /mob/proc/CanContractDisease(datum/disease/D)

diff --git a/code/datums/diseases/_disease.dm b/code/datums/diseases/_disease.dm
@@ -158,10 +158,9 @@ GLOBAL_LIST_INIT(diseases, subtypesof(/datum/disease))
 	qdel(src)
 
 /datum/disease/proc/IsSame(datum/disease/D)
-	if(istype(src, D.type))
-		return 1
-	return 0
-
+	if(ispath(D))
+		return istype(src, D)
+	return istype(src, D.type)
 
 /datum/disease/proc/Copy()
 	var/datum/disease/D = new type()

diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm
@@ -86,13 +86,16 @@ GLOBAL_LIST_INIT(advance_cures, list(
 
 // Compares type then ID.
 /datum/disease/advance/IsSame(datum/disease/advance/D)
+	if(ispath(D))
+		return FALSE
 
-	if(!(istype(D, /datum/disease/advance)))
-		return 0
+	if(!istype(D, /datum/disease/advance))
+		return FALSE
 
 	if(GetDiseaseID() != D.GetDiseaseID())
-		return 0
-	return 1
+		return FALSE
+
+	return TRUE
 
 // To add special resistances.
 /datum/disease/advance/cure(resistance=1)

diff --git a/code/game/area/ss13_areas/command_areas.dm b/code/game/area/ss13_areas/command_areas.dm
@@ -72,7 +72,3 @@
 /area/station/command/customs
 	name = "Контрольно-Пропускной Пункт Командования"
 	icon_state = "checkpoint1"
-
-/area/station/command/customs2
-	name = "Дополнительный Контрольно-Пропускной Пункт Командования"
-	icon_state = "security"
diff --git a/code/game/area/ss13_areas/legal_areas.dm b/code/game/area/ss13_areas/legal_areas.dm
@@ -17,7 +17,3 @@
 	icon_state = "magistrate"
 	sound_environment = SOUND_AREA_SMALL_SOFTFLOOR
 
-/area/station/legal/courtroom/dap
-	name = "Комната Защиты и Обвинения"
-	icon_state = "seccourt"
-	sound_environment = SOUND_AREA_LARGE_ENCLOSED
diff --git a/code/game/area/ss13_areas/medical_areas.dm b/code/game/area/ss13_areas/medical_areas.dm
@@ -53,27 +53,10 @@
 	name = "Комната Ожидания Медицинского Отдела"
 	icon_state = "patientsward"
 
-/area/station/medical/isolation/a
-	name = "Комната Изоляции А"
-	icon_state = "medbayisoa"
-
-/area/station/medical/isolation/b
-	name = "Комната Изоляции Б"
-	icon_state = "medbayisob"
-
-/area/station/medical/isolation/c
-	name = "Комната Изоляции В"
-	icon_state = "medbayisoc"
-
-/area/station/medical/isolation
-	name = "Зона Изоляции"
-	icon_state = "medbayisoaccess"
-
 /area/station/medical/coldroom
 	name = "Морозильная Камера Медицинского Отдела"
 	icon_state = "coldroom"
 
-
 /area/station/medical/storage/secondary
 	name = "Дополнительный Склад Медицинского Отдела"
 	icon_state = "medbaysecstorage"

diff --git a/code/game/area/ss13_areas/public_areas.dm b/code/game/area/ss13_areas/public_areas.dm
@@ -163,14 +163,6 @@
 	name = "Вторичное Криохранилище Дормитория"
 	icon_state = "Sleep"
 
-/area/station/public/sleep_male
-	name = "Мужские Дормитории"
-	icon_state = "Sleep"
-
-/area/station/public/sleep_female
-	name = "Женские Дормитории"
-	icon_state = "Sleep"
-
 /area/station/public/locker
 	name = "Бытовое Помещение"
 	icon_state = "locker"
@@ -180,12 +172,6 @@
 	icon_state = "toilet"
 	sound_environment = SOUND_AREA_SMALL_ENCLOSED
 
-/area/station/public/toilet/male
-	name = "Мужские Туалеты"
-
-/area/station/public/toilet/female
-	name = "Женские Туалеты"
-
 /area/station/public/toilet/unisex
 	name = "Общие Туалеты"
 
@@ -204,10 +190,6 @@
 	name = "Забегаловка Мистера Чанга"
 	icon_state = "changs"
 
-/area/station/public/clothing
-	name = "Магазин Одежды"
-	icon_state = "Theatre"
-
 /area/station/public/pet_store
 	name = "Зоомагазин"
 	icon_state = "pet_store"
@@ -230,10 +212,6 @@
 	name = "Основное Хранилище Инструментов"
 	icon_state = "primarystorage"
 
-/area/station/public/storage/autolathe
-	name = "Хранилище Автолата"
-	icon_state = "storage"
-
 /area/station/public/storage/art
 	name = "Хранилище Художественных Принадлежностей"
 	icon_state = "storage"
@@ -250,9 +228,6 @@
 	name = "Комната Канцелярских Принадлежностей"
 	icon_state = "office_supplies"
 
-/area/station/public/recreation
-	name = "Зона Отдыха"
-
 /area/station/public/construction
 	name = "Зона Для Строительства"
 	icon_state = "construction"

diff --git a/code/game/area/ss13_areas/security_areas.dm b/code/game/area/ss13_areas/security_areas.dm
@@ -51,14 +51,6 @@
 	name = "Тюремный Блок А"
 	icon_state = "brigcella"
 
-/area/station/security/prison/cell_block/B
-	name = "Тюремный Блок Б"
-	icon_state = "brigcellb"
-
-/area/station/security/prison/cell_block/C
-	name = "Тюремный Блок В"
-	icon_state = "brig"
-
 /area/station/security/execution
 	name = "Комната Казни"
 	icon_state = "execution"
@@ -78,11 +70,6 @@
 	name = "Склад Снаряжения Службы Безопасности"
 	icon_state = "securityequipmentstorage"
 
-/area/station/security/interrogation/observation
-	name = "Просматриваемая Допросная"
-	icon_state = "security"
-	can_get_auto_cryod = FALSE
-
 /area/station/security/evidence
 	name = "Комната Хранения Улик"
 	icon_state = "evidence"
@@ -110,10 +97,6 @@
 	name = "Защищенная Оружейная"
 	icon_state = "secarmory"
 
-/area/station/security/securehallway
-	name = "Защищенный Коридор Брига"
-	icon_state = "securehall"
-
 /area/station/security/detective
 	name = "Офис Детектива"
 	icon_state = "detective"
@@ -133,22 +116,6 @@
 	name = "Дополнительный Контрольно-Пропускной Пункт Службы Безопасности"
 	icon_state = "checkpoint1"
 
-/area/station/security/checkpoint/supply
-	name = "Контрольно-Пропускной Пункт Службы Безопасности - Отдел Карго"
-	icon_state = "checkpoint1"
-
-/area/station/security/checkpoint/engineering
-	name = "Контрольно-Пропускной Пункт Службы Безопасности - Инженерный Отдел"
-	icon_state = "checkpoint1"
-
-/area/station/security/checkpoint/medical
-	name = "Контрольно-Пропускной Пункт Службы Безопасности - Медицинский Отдел"
-	icon_state = "checkpoint1"
-
-/area/station/security/checkpoint/science
-	name = "Контрольно-Пропускной Пункт Службы Безопасности - РНД"
-	icon_state = "checkpoint1"
-
 // Solitary
 /area/station/security/permasolitary
 	name = "Одиночная Камера"

diff --git a/code/game/area/ss13_areas/service_areas.dm b/code/game/area/ss13_areas/service_areas.dm
@@ -12,10 +12,6 @@
 	icon_state = "bar"
 	sound_environment = SOUND_AREA_WOODFLOOR
 
-/area/station/service/bar/atrium
-	name = "Атриум"
-	icon_state = "bar"
-
 /area/station/service/theatre
 	name = "Театр"
 	icon_state = "Theatre"

diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm
@@ -186,6 +186,7 @@
 	put_in(L)
 	if(user.pulling == L)
 		user.stop_pulling()
+	QDEL_LIST_CONTENTS(L.grabbed_by)
 	return TRUE
 
 /obj/machinery/dna_scannernew/attackby(obj/item/I, mob/user, params)

diff --git a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm
@@ -38,6 +38,7 @@
 		return TRUE
 	visible_message("<span class='notice'>[user] puts [target] into [src].</span>")
 
+	QDEL_LIST_CONTENTS(target.grabbed_by)
 	target.forceMove(src)
 	occupant = target
 	flash = "Machine ready."

diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
@@ -502,6 +502,7 @@
 		add_fingerprint(user)
 		if(user.pulling == L)
 			user.stop_pulling()
+		QDEL_LIST_CONTENTS(L.grabbed_by)
 		SStgui.update_uis(src)
 
 /obj/machinery/sleeper/proc/permitted_check(atom/movable/O, mob/user)

diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm
@@ -148,6 +148,7 @@
 	else
 		visible_message("[user] puts [H] into the body scanner.")
 
+	QDEL_LIST_CONTENTS(H.grabbed_by)
 	H.forceMove(src)
 	occupant = H
 	playsound(src, 'sound/machines/podclose.ogg', 5)

diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
@@ -126,7 +126,7 @@
 	var/msg2 = "<span class='notice'>The camera already has that upgrade!</span>"
 
 	if(istype(I, /obj/item/stack/sheet/mineral/plasma) && panel_open)
-		if(!user.drop_item())
+		if(!user.canUnEquip(I, FALSE))
 			to_chat(user, "<span class='warning'>[I] is stuck to your hand!</span>")
 			return
 		if(!isEmpProof())
@@ -137,7 +137,7 @@
 		else
 			to_chat(user, "[msg2]")
 	else if(istype(I, /obj/item/assembly/prox_sensor) && panel_open)
-		if(!user.drop_item())
+		if(!user.canUnEquip(I, FALSE))
 			to_chat(user, "<span class='warning'>[I] is stuck to your hand!</span>")
 			return
 		if(!isMotion())

diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
@@ -576,6 +576,7 @@
 		return
 	if(!E)
 		return
+	QDEL_LIST_CONTENTS(E.grabbed_by)
 	E.forceMove(src)
 	time_till_despawn = initial(time_till_despawn) / willing_factor
 	icon_state = occupied_icon_state

diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
@@ -230,6 +230,7 @@
 		return
 
 	target.stop_pulling()
+	QDEL_LIST_CONTENTS(target.grabbed_by)
 	target.forceMove(src)
 	occupant = target
 

diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
@@ -363,6 +363,9 @@ GLOBAL_LIST_EMPTY(allRequestConsoles)
 	set_light(2)
 
 /obj/machinery/requests_console/proc/remind_unread_messages()
+	if(reminder_timer_id == TIMER_ID_NULL)
+		return
+
 	if(newmessagepriority == RQ_NONEW_MESSAGES)
 		deltimer(reminder_timer_id)
 		reminder_timer_id = TIMER_ID_NULL

diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
@@ -449,15 +449,18 @@
 	return TRUE
 
 /obj/machinery/suit_storage_unit/proc/put_in(mob/user, mob/living/target)
-	if(do_mob(user, target, 30))
-		if(occupant || helmet || suit || storage)
-			return
-		if(target == user)
-			user.visible_message("<span class='warning'>[user] slips into [src] and closes the door behind [user.p_them()]!</span>", "<span class='notice'>You slip into [src]'s cramped space and shut its door.</span>")
-		else
-			target.visible_message("<span class='warning'>[user] pushes [target] into [src] and shuts its door!<span>", "<span class='userdanger'>[user] shoves you into [src] and shuts the door!</span>")
-		close_machine(target)
-		add_fingerprint(user)
+	if(!do_mob(user, target, 30))
+		return
+	if(occupant || helmet || suit || storage)
+		return
+	if(target == user)
+		user.visible_message("<span class='warning'>[user] slips into [src] and closes the door behind [user.p_them()]!</span>", "<span class='notice'>You slip into [src]'s cramped space and shut its door.</span>")
+	else
+		target.visible_message("<span class='warning'>[user] pushes [target] into [src] and shuts its door!<span>", "<span class='userdanger'>[user] shoves you into [src] and shuts the door!</span>")
+	close_machine(target)
+	if(occupant == target)
+		QDEL_LIST_CONTENTS(target.grabbed_by)
+	add_fingerprint(user)
 
 /obj/machinery/suit_storage_unit/proc/cook()
 	if(uv_cycles)

diff --git a/code/game/objects/effects/decals/Cleanable/misc_cleanables.dm b/code/game/objects/effects/decals/Cleanable/misc_cleanables.dm
@@ -77,6 +77,11 @@
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "flour"
 
+/obj/effect/decal/cleanable/flour/nanofrost
+	name = "nanofrost residue"
+	desc = "Residue left behind from a nanofrost detonation. Perhaps there was a fire here?"
+	color = "#B2FFFF"
+
 /obj/effect/decal/cleanable/flour/foam
 	name = "Fire fighting foam"
 	desc = "It's foam."

diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm
@@ -13,14 +13,14 @@
 	var/expand = 1
 	var/metal = 0
 
-/obj/effect/particle_effect/foam/New(loc, ismetal=0)
+/obj/effect/particle_effect/foam/New(loc, ismetal = FALSE)
 	..(loc)
 	icon_state = "[ismetal ? "m":""]foam"
 	if(!ismetal && reagents)
 		color = mix_color_from_reagents(reagents.reagent_list)
 	metal = ismetal
-	playsound(src, 'sound/effects/bubbles2.ogg', 80, 1, -3)
-	spawn(3 + metal*3)
+	playsound(src, 'sound/effects/bubbles2.ogg', 80, TRUE, -3)
+	spawn(3 + metal * 3)
 		process()
 	spawn(120)
 		STOP_PROCESSING(SSobj, src)

diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm
@@ -171,7 +171,7 @@
 		for(var/obj/item/Item in T)
 			Item.extinguish()
 
-/datum/effect_system/smoke_spread/freezing/set_up(amount = 5, only_cardinals = FALSE, source, desired_direction, blasting = 0)
+/datum/effect_system/smoke_spread/freezing/set_up(amount = 5, only_cardinals = FALSE, source, desired_direction, blasting = FALSE)
 	..()
 	blast = blasting
 

diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
@@ -423,7 +423,7 @@ REAGENT SCANNER
 			organ_found = null
 			if(LAZYLEN(H.internal_organs))
 				for(var/obj/item/organ/internal/O in H.internal_organs)
-					if(!O.is_robotic() || istype(O, /obj/item/organ/internal/cyberimp) || O.stealth_level <= 1)
+					if(!O.is_robotic() || istype(O, /obj/item/organ/internal/cyberimp) || O.stealth_level > 1)
 						continue
 					organ_found = TRUE
 					msgs += "[capitalize(O.name)]: <font color='red'>[O.damage]</font>"

diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm
@@ -317,6 +317,7 @@
 
 	to_chat(user, "<span class='notice'>You erase the data from [src].</span>")
 	used_capacity = 0
+	remaining_capacity = max_capacity
 	storedinfo.Cut()
 	timestamp.Cut()