Merge remote-tracking branch 'upstream/master' into Delta_fix_pack

_maps/map_files220/delta/delta.dmm

@@ -1533,11 +1533,6 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/starboard)
 "amh" = (
-/obj/structure/disposalpipe/sortjunction/reversed{
-	dir = 4;
-	name = "Disposals Maint";
-	sort_type_txt = "1"
-	},
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
 /obj/structure/cable{
@@ -1560,6 +1555,10 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 8;
+	icon_state = "pipe-c"
+	},
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/disposal/west)
 "amu" = (
@@ -3460,9 +3459,6 @@
 	},
 /area/station/maintenance/disposal/west)
 "asN" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
@@ -3474,6 +3470,10 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 1;
+	icon_state = "pipe-c"
+	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "brown"
@@ -7218,6 +7218,9 @@
 	},
 /area/station/hallway/primary/fore)
 "aFD" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 8
+	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	dir = 6;
@@ -11094,10 +11097,11 @@
 /turf/simulated/floor/plasteel,
 /area/station/security/permabrig)
 "aWG" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 8
-	},
 /obj/machinery/light/small/directional/north,
+/obj/structure/disposalpipe/segment{
+	dir = 2;
+	icon_state = "pipe-c"
+	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
 	icon_state = "brown"
@@ -22721,16 +22725,15 @@
 	},
 /area/station/maintenance/fsmaint)
 "bPq" = (
-/obj/machinery/disposal/deliveryChute{
-	dir = 4;
-	name = "CORPSE disposal unit"
-	},
 /obj/structure/disposalpipe/trunk{
 	dir = 4
 	},
 /obj/structure/window/reinforced{
 	dir = 4
 	},
+/obj/machinery/disposal/deliveryChute{
+	dir = 8
+	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/disposal/west)
 "bPs" = (
@@ -61634,16 +61637,18 @@
 	},
 /area/station/medical/paramedic)
 "ipY" = (
-/obj/structure/disposalpipe/segment,
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 8
+/obj/structure/disposalpipe/sortjunction{
+	dir = 1;
+	name = "Disposals Maint";
+	sort_type_txt = "1"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "brown"
@@ -72645,10 +72650,12 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "brown"
 	},

code/controllers/subsystem/SSjobs.dm

@@ -473,7 +473,7 @@ SUBSYSTEM_DEF(jobs)
 		var/turf/T = null
 		var/obj/S = null
 		for(var/obj/effect/landmark/start/sloc in GLOB.landmarks_list)
-			if(sloc.name != rank)
+			if(sloc.name != rank && sloc.name != job.relate_job)	// SS220 EDIT - Novice Jobs - Jobs relate module
 				continue
 			if(locate(/mob/living) in sloc.loc)
 				continue

code/datums/datacore.dm

@@ -480,6 +480,25 @@ GLOBAL_VAR_INIT(record_id_num, 1001)
 			clothes_s = new /icon('icons/mob/clothing/under/rnd.dmi', "robotics_s")
 			clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
 			clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+
+		// SS220 ADDITION - START
+		if("Student Scientist")
+			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")
+			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)
+		if("Security Cadet")
+			clothes_s = new /icon('modular_ss220/jobs/icons/clothing/mob/uniform.dmi', "cadet_s")
+			clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY)
+		if("Trainee Engineer")
+			clothes_s = new /icon('modular_ss220/jobs/icons/clothing/mob/uniform.dmi', "trainee_s")
+			clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "orange"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY)
+		// SS220 ADDITION - END
+
 		if("Syndicate Agent")
 			clothes_s = new /icon('icons/mob/clothing/under/syndicate.dmi', "syndicate_s")
 			clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)

code/game/jobs/job/engineering_jobs.dm

@@ -83,7 +83,7 @@
 	dufflebag = /obj/item/storage/backpack/duffel/engineering
 	box = /obj/item/storage/box/engineer
 
-
+/datum/job/engineer/trainee	// SS220 ADDITION - new jobs
 
 /datum/job/atmos
 	title = "Life Support Specialist"

code/game/jobs/job/medical_jobs.dm

@@ -76,6 +76,8 @@
 	satchel = /obj/item/storage/backpack/satchel_med
 	dufflebag = /obj/item/storage/backpack/duffel/medical
 
+/datum/job/doctor/intern	// SS220 ADDITION - new jobs
+
 /datum/job/coroner
 	title = "Coroner"
 	flag = JOB_CORONER

code/game/jobs/job/science_jobs.dm

@@ -86,6 +86,7 @@
 	satchel = /obj/item/storage/backpack/satchel_tox
 	dufflebag = /obj/item/storage/backpack/duffel/science
 
+/datum/job/scientist/student	// SS220 ADDITION - new jobs
 
 /datum/job/roboticist
 	title = "Roboticist"

code/game/jobs/job/security_jobs.dm

@@ -197,3 +197,4 @@
 	satchel = /obj/item/storage/backpack/satchel_sec
 	dufflebag = /obj/item/storage/backpack/duffel/security
 
+/datum/job/officer/cadet	// SS220 ADDITION - new jobs

code/modules/antagonists/traitor/datum_traitor.dm

@@ -92,7 +92,7 @@
  */
 /datum/antagonist/traitor/proc/forge_human_objectives()
 	// Hijack objective.
-	if(prob(10) && !(locate(/datum/objective/hijack) in owner.get_all_objectives()))
+	if(prob(2) && !(locate(/datum/objective/hijack) in owner.get_all_objectives())) // SS220 EDIT prob(10 -> 2)
 		add_antag_objective(/datum/objective/hijack)
 		return // Hijack should be their only objective (normally), so return.
 

config/example/config.toml

@@ -418,17 +418,21 @@ job_slot_amounts = [
 	# Engineering
 	{name = "Life Support Specialist", lowpop = 3, highpop = 4},
 	{name = "Station Engineer", lowpop = 5, highpop = 6},
+	{name = "Trainee Engineer", lowpop = 0, highpop = 0},
 	# Medical
 	{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 = "Virologist", lowpop = 1, highpop = 1},
 	# Science
 	{name = "Roboticist", lowpop = 2, highpop = 2},
 	{name = "Scientist", lowpop = 6, highpop = 7},
+	{name = "Student Scientist", lowpop = 0, highpop = 0},
 	# Security
 	{name = "Detective", lowpop = 1, highpop = 1},
 	{name = "Security Officer", lowpop = 8, highpop = 9},
+	{name = "Security Cadet", lowpop = 0, highpop = 0},
 	{name = "Warden", lowpop = 1, highpop = 1},
 	{name = "Internal Affairs Agent", lowpop = 2, highpop = 2},
 	# Service

modular_ss220/_defines220/_defines220.dme

@@ -12,3 +12,5 @@
 #include "code/hud_ss220.dm"
 #include "code/layers_ss220.dm"
 #include "code/signals_atom.dm"
+#include "code/jobs_defines.dm"
+#include "code/donor.dm"

modular_ss220/_defines220/code/donor.dm

@@ -0,0 +1,7 @@
+// Special tiers for ss220 staff
+#define BIG_WORKER_TIER 220
+#define LITTLE_WORKER_TIER 110
+
+// What TTS level does it give access to?
+#define BIG_WORKER_TTS_LEVEL 3
+#define LITTLE_WORKER_TTS_LEVEL 1

modular_ss220/_defines220/code/jobs_defines.dm

@@ -0,0 +1,11 @@
+#define NOVICE_JOB_MINUTES 120
+#define NOVICE_CADET_JOB_MINUTES 300
+
+// JOBCAT_ENGSEC
+#define JOB_TRAINEE				(1<<15)
+#define JOB_CADET				(1<<16)
+
+// JOBCAT_MEDSCI
+#define JOB_INTERN				(1<<11)
+#define JOB_STUDENT				(1<<12)
+// Если ОФФы добавят новую должность в отдел, то потребуется смещение

modular_ss220/donor/code/client_procs.dm

@@ -2,8 +2,10 @@
 
 
 /datum/client_login_processor/donator_check/proc/CheckAutoDonatorLevel(client/C)
+	var/list/big_worker = list("Админ", "Старший Администратор", "Разработчик", "Бригадир мапперов", "Маппер")
+
 	if(C.holder)
-		C.donator_level = 2
+		C.donator_level = (C.holder.rank in big_worker) ? BIG_WORKER_TIER : LITTLE_WORKER_TIER
 		return
 
 	var/is_wl = GLOB.configuration.overflow.reroute_cap == 0.5 ? TRUE : FALSE
@@ -17,7 +19,7 @@
 		return
 
 	while(rank_ckey_read.NextRow())
-		C.donator_level = 2
+		C.donator_level = (rank_ckey_read.item[1] in big_worker) ? BIG_WORKER_TIER : LITTLE_WORKER_TIER
 
 	qdel(rank_ckey_read)
 
@@ -42,7 +44,13 @@
 			if(10000 to INFINITY)
 				donator_level = DONATOR_LEVEL_MAX
 
-		C.donator_level = max(donator_level, C.donator_level)
+		switch(C.donator_level)
+			if(LITTLE_WORKER_TIER)
+				C.donator_level = LITTLE_WORKER_TTS_LEVEL > donator_level ? C.donator_level : donator_level
+			if(BIG_WORKER_TIER)
+				C.donator_level = BIG_WORKER_TTS_LEVEL > donator_level ? C.donator_level : donator_level
+			else
+				C.donator_level = donator_level
 
 
 	C.donor_loadout_points()
@@ -77,13 +85,23 @@
 			prefs.max_gear_slots += 12
 		if(5)
 			prefs.max_gear_slots += 16
+		if(LITTLE_WORKER_TIER)
+			prefs.max_gear_slots += 1
+		if(BIG_WORKER_TIER)
+			prefs.max_gear_slots += 5
 
 /client/proc/donor_character_slots()
 	if(!prefs)
 		return
 
 	prefs.max_save_slots = MAX_SAVE_SLOTS_SS220 + 5 * donator_level
 
+	switch(donator_level)
+		if(LITTLE_WORKER_TIER)
+			prefs.max_save_slots = 7
+		if(BIG_WORKER_TIER)
+			prefs.max_save_slots = 10
+
 	prefs.character_saves.len = prefs.max_save_slots
 
 #undef MAX_SAVE_SLOTS_SS220

modular_ss220/jobs/_jobs.dm

@@ -2,3 +2,13 @@
 	name = "Работы"
 	desc = "Новые джобки и изменения старых"
 	author = "furior, PhantomRU"
+
+/datum/modpack/jobs/initialize()
+	. = ..()
+
+	GLOB.security_positions |= GLOB.security_positions_ss220
+	GLOB.active_security_positions |= GLOB.security_positions_ss220
+
+	GLOB.medical_positions |= GLOB.medical_positions_ss220
+	GLOB.engineering_positions |= GLOB.engineering_positions_ss220
+	GLOB.science_positions |= GLOB.science_positions_ss220

modular_ss220/jobs/_jobs.dme

@@ -1,13 +1,24 @@
 #include "_jobs.dm"
 
 #include "code/access.dm"
-// #include "code/cards_ids.dm"
-// #include "code/jobs.dm"
-// #include "code/clothing/engineering_clothing.dm"
-// #include "code/clothing/medical_clothing.dm"
-// #include "code/clothing/science_clothing.dm"
-// #include "code/clothing/security_clothing.dm"
-// #include "code/job/engineering_jobs.dm"
-// #include "code/job/medical_jobs.dm"
-// #include "code/job/science_jobs.dm"
-// #include "code/job/security_jobs.dm"
+#include "code/card_computer.dm"
+#include "code/card_id.dm"
+#include "code/departaments.dm"
+#include "code/jobs_global_list.dm"
+#include "code/jobs_character.dm"
+#include "code/jobs_gamemodes.dm"
+#include "code/jobs.dm"
+#include "code/clothing/engineering_clothing.dm"
+#include "code/clothing/medical_clothing.dm"
+#include "code/clothing/science_clothing.dm"
+#include "code/clothing/security_clothing.dm"
+#include "code/job/engineering_jobs.dm"
+#include "code/job/medical_jobs.dm"
+#include "code/job/science_jobs.dm"
+#include "code/job/security_jobs.dm"
+#include "code/objects/job_objects.dm"
+#include "code/objects/engineering_job_objects.dm"
+#include "code/objects/medical_job_objects.dm"
+#include "code/objects/science_job_objects.dm"
+#include "code/objects/security_job_objects.dm"
+#include "code/objects/wardrobe_vendors.dm"

modular_ss220/jobs/code/card_computer.dm

@@ -0,0 +1,21 @@
+/obj/machinery/computer/card/ui_data(mob/user)
+	var/list/data = ..()
+
+	if(mode == IDCOMPUTER_SCREEN_TRANSFER) // JOB TRANSFER
+		if(modify && scan && !target_dept)
+			data["card_skins"] |= format_card_skins(GLOB.card_skins_ss220)
+
+	return data
+
+/obj/machinery/computer/card/ui_act(action, params)
+	. = ..()
+	switch(action)
+		if("skin")
+			if(!modify)
+				return FALSE
+			var/skin = params["skin_target"]
+			if(!skin || !(skin in GLOB.card_skins_ss220))
+				return FALSE
+
+			modify.icon_state = skin//get_card_skins_ss220(skin)
+			return TRUE