Merge branch 'ss220club:master' into peas_shooter

ss220club · Mar 7, 2024 · 2c70eea · 2c70eea
2 parents cebab39 + 43e26d8
commit 2c70eea
Show file tree

Hide file tree

Showing 15 changed files with 42 additions and 13 deletions.
diff --git a/_maps/map_files220/delta/delta.dmm b/_maps/map_files220/delta/delta.dmm
@@ -30517,7 +30517,6 @@
 "csf" = (
 /obj/structure/cable,
 /obj/machinery/power/apc/directional/south,
-/obj/effect/landmark/damageturf,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	icon_state = "black"
@@ -33943,6 +33942,11 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 4
 	},
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
+	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "red"
@@ -50020,6 +50024,11 @@
 /obj/machinery/door/firedoor,
 /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
 /obj/effect/mapping_helpers/airlock/access/any/service/theatre,
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/fore)
 "eBE" = (
@@ -83693,6 +83702,11 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 4
 	},
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "red"

diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm
@@ -500,7 +500,7 @@ GLOBAL_VAR_INIT(record_id_num, 1001)
 			clothes_s = new /icon('modular_ss220/jobs/icons/clothing/mob/uniform.dmi', "student_s")
 			clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY)
 			clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY)
-		if("Intern")
+		if("Medical Intern")
 			clothes_s = new /icon('modular_ss220/jobs/icons/clothing/mob/uniform.dmi', "intern_s")
 			clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY)
 			clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_OVERLAY)

diff --git a/config/example/config.toml b/config/example/config.toml
@@ -426,7 +426,7 @@ job_slot_amounts = [
 	{name = "Chemist", lowpop = 2, highpop = 2},
 	{name = "Geneticist", lowpop = 2, highpop = 2},
 	{name = "Medical Doctor", lowpop = 5, highpop = 6},
-	{name = "Intern", lowpop = 0, highpop = 0},
+	{name = "Medical Intern", lowpop = 0, highpop = 0},
 	{name = "Virologist", lowpop = 1, highpop = 1},
 	# Science
 	{name = "Roboticist", lowpop = 2, highpop = 2},

diff --git a/modular_ss220/jobs/code/card_id.dm b/modular_ss220/jobs/code/card_id.dm
@@ -38,7 +38,7 @@ GLOBAL_LIST_INIT(card_skins_donor_ss220, list(
 	registered_name = "Intern"
 	icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi'
 	icon_state = "intern"
-	rank = "Intern"
+	rank = "Medical Intern"
 
 /obj/item/card/id/research/student
 	name = "Student ID"

diff --git a/modular_ss220/jobs/code/job/medical_jobs.dm b/modular_ss220/jobs/code/job/medical_jobs.dm
@@ -1,5 +1,5 @@
 /datum/job/doctor/intern
-	title = "Intern"
+	title = "Medical Intern"
 	flag = JOB_INTERN
 	total_positions = 0
 	spawn_positions = 3
@@ -10,7 +10,7 @@
 	important_information = "Ваша должность ограничена во всех взаимодействиях с рабочим имуществом отдела и экипажем станции, при отсутствии приставленного к нему квалифицированного сотрудника или полученного разрешения от вышестоящего начальства."
 
 /datum/outfit/job/doctor/intern
-	name = "Intern"
+	name = "Medical Intern"
 	jobtype = /datum/job/doctor/intern
 
 	uniform = /obj/item/clothing/under/rank/medical/doctor/intern

diff --git a/modular_ss220/jobs/code/jobs.dm b/modular_ss220/jobs/code/jobs.dm
@@ -10,7 +10,7 @@
 	var/is_extra_job = FALSE // Special Jobs Window
 
 /datum/job/doctor
-	relate_job = "Intern"
+	relate_job = "Medical Intern"
 	is_relate_positions = TRUE
 /datum/job/doctor/intern
 	relate_job = "Medical Doctor"

diff --git a/modular_ss220/jobs/code/jobs_character.dm b/modular_ss220/jobs/code/jobs_character.dm
@@ -8,7 +8,7 @@
 		if("Security Cadet")
 			O = new /datum/outfit/plasmaman/security
 
-		if("Intern")
+		if("Medical Intern")
 			O = new /datum/outfit/plasmaman/medical
 
 		if("Student Scientist")

diff --git a/modular_ss220/jobs/code/jobs_global_list.dm b/modular_ss220/jobs/code/jobs_global_list.dm
@@ -1,7 +1,7 @@
 
 // ===================== STATION =====================
 GLOBAL_LIST_INIT(medical_positions_ss220, list(
-	"Intern",
+	"Medical Intern",
 ))
 
 GLOBAL_LIST_INIT(science_positions_ss220, list(

diff --git a/modular_ss220/jobs/code/objects/job_objects.dm b/modular_ss220/jobs/code/objects/job_objects.dm
@@ -7,9 +7,9 @@
 		)
 
 /obj/effect/mob_spawn/human/intern
-	name = "Intern"
-	mob_name = "Intern"
-	id_job = "Intern"
+	name = "Medical Intern"
+	mob_name = "Medical Intern"
+	id_job = "Medical Intern"
 	outfit = /datum/outfit/job/doctor/intern
 
 /obj/effect/mob_spawn/human/trainee

diff --git a/modular_ss220/jobs/icons/hud.dmi b/modular_ss220/jobs/icons/hud.dmi
diff --git a/modular_ss220/objects/_objects.dme b/modular_ss220/objects/_objects.dme
@@ -19,6 +19,7 @@
 #include "code/plastic_chair.dm"
 #include "code/platform.dm"
 #include "code/posters.dm"
+#include "code/smartfridge.dm"
 #include "code/tribune.dm"
 #include "code/weapons.dm"
 #include "code/key.dm"

diff --git a/modular_ss220/objects/code/platform.dm b/modular_ss220/objects/code/platform.dm
@@ -92,7 +92,7 @@
 		CheckLayer()
 	if(istype(O, /obj/structure/platform))
 		return FALSE
-	if(istype(O, /obj/item/projectile))
+	if(istype(O, /obj/item/projectile) || istype(O, /obj/effect))
 		return TRUE
 	if(corner)
 		return !density

diff --git a/modular_ss220/objects/code/smartfridge.dm b/modular_ss220/objects/code/smartfridge.dm
@@ -0,0 +1,10 @@
+/obj/machinery/smartfridge/load(obj/I, mob/user)
+	var/item_loc_origin = I.loc
+	if(!..())
+		return FALSE
+
+	if(istype(item_loc_origin, /obj/item/gripper))
+		var/obj/item/gripper/gripper = item_loc_origin
+		gripper.drop_gripped_item(silent = TRUE)
+		I.forceMove(src)
+	return TRUE
diff --git a/modular_ss220/silicons/code/items/gripper.dm b/modular_ss220/silicons/code/items/gripper.dm
@@ -54,6 +54,7 @@
 					/obj/item/stack/sheet/mineral/plasma, // for repair plasmamans
 					/obj/item/mmi,
 					/obj/item/reagent_containers/pill,
+					/obj/item/reagent_containers/patch,
 					/obj/item/reagent_containers/drinks,
 					/obj/item/reagent_containers/glass,
 					/obj/item/reagent_containers/syringe,

diff --git a/modular_ss220/text_to_speech/code/tts_subsystem.dm b/modular_ss220/text_to_speech/code/tts_subsystem.dm
@@ -119,6 +119,8 @@ SUBSYSTEM_DEF(tts220)
 		"мед" = "м ед",
 		"меде" = "м еде",
 		"кз" = "Кэ Зэ",
+		"дтпа" = "Дэ Тэ Пэ А",
+		"слр" = "Эс Эл Эр"
 	)
 
 	var/static/list/tts_job_replacements = list(
@@ -149,6 +151,7 @@ SUBSYSTEM_DEF(tts220)
 		"chief medical officer" = "Главный врач",
 		"medical doctor" = "Врач",
 		"Intern" = "Интерн",
+		"Medical Intern" = "Медицинский Интерн",
 		"Student Medical Doctor" = "Врач-практикант",
 		"Medical Assistant" = "Ассистирующий врач",
 		"surgeon" = "Хирург",