diff --git a/_maps/map_files/Blueshift/BlueShift_middle.dmm b/_maps/map_files/Blueshift/BlueShift_middle.dmm index d477e2f1c06..7fcf0917a3a 100644 --- a/_maps/map_files/Blueshift/BlueShift_middle.dmm +++ b/_maps/map_files/Blueshift/BlueShift_middle.dmm @@ -80,7 +80,6 @@ /obj/structure/chair{ dir = 4 }, -/obj/effect/landmark/start/junior_officer, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{ dir = 4 }, @@ -13642,7 +13641,6 @@ /obj/structure/chair{ dir = 4 }, -/obj/effect/landmark/start/junior_officer, /turf/open/floor/iron, /area/security/office) "eJG" = ( @@ -22435,7 +22433,6 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/effect/landmark/start/junior_officer, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, @@ -28311,7 +28308,6 @@ /turf/open/floor/iron/dark, /area/security/brig) "kDd" = ( -/obj/effect/landmark/start/junior_officer, /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4, /turf/open/floor/iron, /area/security/brig) @@ -55104,7 +55100,6 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/effect/landmark/start/junior_officer, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{ dir = 5 }, @@ -60778,7 +60773,6 @@ dir = 8 }, /obj/structure/cable, -/obj/effect/landmark/start/junior_officer, /turf/open/floor/iron, /area/security/office) "xwM" = ( diff --git a/_maps/map_files/KiloStation/KiloStation_skyrat.dmm b/_maps/map_files/KiloStation/KiloStation_skyrat.dmm index 6a112244cb0..7024d7b4d36 100644 --- a/_maps/map_files/KiloStation/KiloStation_skyrat.dmm +++ b/_maps/map_files/KiloStation/KiloStation_skyrat.dmm @@ -30120,23 +30120,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) -"cml" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/structure/cable, -/obj/effect/landmark/start/junior_officer, -/turf/open/floor/iron, -/area/security/brig) "cmm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/blood/old, @@ -52736,7 +52719,6 @@ }, /obj/structure/cable, /obj/structure/disposalpipe/segment, -/obj/effect/landmark/start/junior_officer, /turf/open/floor/iron, /area/security/brig) "kuu" = ( @@ -103754,7 +103736,7 @@ cpw crL crY akm -cml +cmz bYm ama aiP @@ -104782,7 +104764,7 @@ cqW ctv aei clo -cml +cmz bYm ama aiT diff --git a/_maps/map_files/MetaStation/MetaStation_skyrat.dmm b/_maps/map_files/MetaStation/MetaStation_skyrat.dmm index 3e84d3c6499..7bfdc5bb8b4 100644 --- a/_maps/map_files/MetaStation/MetaStation_skyrat.dmm +++ b/_maps/map_files/MetaStation/MetaStation_skyrat.dmm @@ -10856,9 +10856,8 @@ /turf/open/floor/iron/dark, /area/security/lockers) "ckq" = ( -/obj/structure/lattice/catwalk, /obj/structure/window/reinforced/spawner, -/turf/open/floor/iron/dark/smooth_large, +/turf/open/floor/catwalk_floor/iron_dark, /area/hallway/secondary/entry) "cku" = ( /obj/structure/closet, @@ -45321,11 +45320,6 @@ /obj/structure/grille/broken, /turf/open/space/basic, /area/space/nearstation) -"nYN" = ( -/obj/structure/cable, -/obj/effect/landmark/start/junior_officer, -/turf/open/floor/iron, -/area/security/brig) "nZb" = ( /obj/machinery/computer/slot_machine{ pixel_y = 2 @@ -57053,7 +57047,6 @@ /obj/machinery/navbeacon/wayfinding, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/start/junior_officer, /turf/open/floor/iron, /area/security/brig) "slV" = ( @@ -59015,12 +59008,11 @@ /turf/open/floor/iron, /area/engineering/atmos) "sWk" = ( -/obj/structure/lattice/catwalk, /obj/machinery/camera/directional/west{ c_tag = "Arrivals - Aft Arm - Lounge" }, /obj/structure/window/reinforced/spawner, -/turf/open/floor/iron/dark/smooth_large, +/turf/open/floor/catwalk_floor/iron_dark, /area/hallway/secondary/entry) "sWD" = ( /obj/machinery/firealarm/directional/west, @@ -104313,7 +104305,7 @@ mxo lIb fNA eGx -nYN +pln mFN aiq azP diff --git a/_maps/map_files/NSSJourney/NSSJourney.dmm b/_maps/map_files/NSSJourney/NSSJourney.dmm index 6afabca9544..529a9b81761 100644 --- a/_maps/map_files/NSSJourney/NSSJourney.dmm +++ b/_maps/map_files/NSSJourney/NSSJourney.dmm @@ -36983,13 +36983,6 @@ }, /turf/open/floor/iron/dark, /area/security/office) -"dSk" = ( -/obj/structure/cable, -/obj/effect/landmark/start/junior_officer, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/security/brig) "dSm" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, @@ -89016,7 +89009,7 @@ guI frB agn tbC -dSk +aEh oKN pnU snm @@ -89273,7 +89266,7 @@ kdi aii agn qEg -dSk +aEh pmL vad jXa @@ -89530,7 +89523,7 @@ rDW hgP adR ibI -dSk +aEh oKN pnU snm @@ -89787,7 +89780,7 @@ egw xiQ czy xqA -dSk +aEh yls agj agj diff --git a/code/__DEFINES/atom_hud.dm b/code/__DEFINES/atom_hud.dm index 9caa2677550..8336af376f6 100644 --- a/code/__DEFINES/atom_hud.dm +++ b/code/__DEFINES/atom_hud.dm @@ -117,6 +117,29 @@ #define SECHUD_CHEF "hudchef" +///SKYRAT EDIT ADDITION - (Semi)MODULAR JOBS +//SR Security +#define SECHUD_CORRECTIONS_OFFICER "hudcorrectionsofficer" +#define SECHUD_SECURITY_MEDIC "hudsecuritymedic" +//SR Departmental Guards +#define SECHUD_ENGINEERING_GUARD "hudengineeringguard" +#define SECHUD_ORDERLY "hudorderly" +#define SECHUD_CUSTOMS_AGENT "hudcustomsagent" +#define SECHUD_BOUNCER "hudbouncer" +#define SECHUD_SCIENCE_GUARD "hudscienceguard" +//SR Nanotrasen +#define SECHUD_BLUESHIELD "hudblueshield" +#define SECHUD_NT_REP "hudnanotrasenrepresentative" +//SR SolFed +#define SECHUD_SPACE_POLICE "hudspacepolice" +#define SECHUD_SOLFED "hudsolfed" +#define SECHUD_SOLFED_LIASON "hudsolfedliasion" +//SR Misc +#define SECHUD_BARBER "hudbarber" +#define SECHUD_VANGUARD_OPERATIVE "hudexpeditionarytrooper" +#define SECHUD_SCRAMBLED "hudscrambled" +///SKYRAT EDIT ADDITION END + #define SECHUD_DEATH_COMMANDO "huddeathcommando" #define SECHUD_EMERGENCY_RESPONSE_TEAM_COMMANDER "hudemergencyresponseteamcommander" diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index 2d7826b98ee..0f1f7ce34e7 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -50,8 +50,6 @@ #define JOB_SECURITY_OFFICER_SUPPLY "Security Officer (Cargo)" #define JOB_CORRECTIONS_OFFICER "Corrections Officer" // SKYRAT EDIT ADDITION #define JOB_SECURITY_MEDIC "Security Medic" // SKYRAT EDIT ADDITION -#define JOB_SECURITY_SERGEANT "Security Sergeant" // SKYRAT EDIT ADDITION -#define JOB_CIVIL_DISPUTES_OFFICER "Civil Disputes Officer" // SKYRAT EDIT ADDITION //Engineering #define JOB_STATION_ENGINEER "Station Engineer" #define JOB_ATMOSPHERIC_TECHNICIAN "Atmospheric Technician" @@ -113,8 +111,8 @@ // SKYRAT EDIT ADDITION START // Off-Station #define JOB_SPACE_POLICE "Space Police" -#define JOB_SOLGOV "SolGov" -#define JOB_SOLGOV_LIASON "SolGov Liason" +#define JOB_SOLFED "SolFed" +#define JOB_SOLFED_LIASON "SolFed Liason" // SKYRAT EDIT ADDITION END @@ -151,20 +149,18 @@ #define JOB_DISPLAY_ORDER_EXP_CORPS 31 //SKYRAT EDIT ADDITON #define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 32 #define JOB_DISPLAY_ORDER_WARDEN 33 -#define JOB_DISPLAY_ORDER_SECURITY_SERGEANT 34 //SKYRAT EDIT ADDITON -#define JOB_DISPLAY_ORDER_DETECTIVE 35 -#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 36 -#define JOB_DISPLAY_ORDER_JUNIOR_SECURITY_OFFICER 37 -#define JOB_DISPLAY_ORDER_SECURITY_MEDIC 38 //SKYRAT EDIT ADDITON -#define JOB_DISPLAY_ORDER_PRISONER 39 -#define JOB_DISPLAY_ORDER_BRIGOFF 40 //SKYRAT EDIT ADDITON -#define JOB_DISPLAY_ORDER_NANOTRASEN_REPRESENTATIVE 41 //SKYRAT EDIT ADDITON -#define JOB_DISPLAY_ORDER_BLUESHIELD 42 //SKYRAT EDIT ADDITON -#define JOB_DISPLAY_ORDER_ORDERLY 43 //SKYRAT EDIT ADDITION -#define JOB_DISPLAY_ORDER_SCIENCE_GUARD 44 //SKYRAT EDIT ADDITION -#define JOB_DISPLAY_ORDER_BOUNCER 45 //SKYRAT EDIT ADDITION -#define JOB_DISPLAY_ORDER_ENGINEER_GUARD 46 //SKYRAT EDIT ADDITION -#define JOB_DISPLAY_ORDER_CUSTOMS_AGENT 47 //SKYRAT EDIT ADDITION +#define JOB_DISPLAY_ORDER_DETECTIVE 34 +#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 35 +#define JOB_DISPLAY_ORDER_SECURITY_MEDIC 36 //SKYRAT EDIT ADDITON +#define JOB_DISPLAY_ORDER_PRISONER 37 +#define JOB_DISPLAY_ORDER_BRIGOFF 38 //SKYRAT EDIT ADDITON +#define JOB_DISPLAY_ORDER_NANOTRASEN_REPRESENTATIVE 29 //SKYRAT EDIT ADDITON +#define JOB_DISPLAY_ORDER_BLUESHIELD 40 //SKYRAT EDIT ADDITON +#define JOB_DISPLAY_ORDER_ORDERLY 41 //SKYRAT EDIT ADDITION +#define JOB_DISPLAY_ORDER_SCIENCE_GUARD 42 //SKYRAT EDIT ADDITION +#define JOB_DISPLAY_ORDER_BOUNCER 43 //SKYRAT EDIT ADDITION +#define JOB_DISPLAY_ORDER_ENGINEER_GUARD 44 //SKYRAT EDIT ADDITION +#define JOB_DISPLAY_ORDER_CUSTOMS_AGENT 45 //SKYRAT EDIT ADDITION #define DEPARTMENT_UNASSIGNED "No department assigned" diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index e27967777cd..ad21c404d1d 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -108,10 +108,9 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) JOB_SECURITY_OFFICER_SCIENCE = 15, JOB_SECURITY_OFFICER_SUPPLY = 16, */ - JOB_SECURITY_SERGEANT = 13, // SKYRAT EDIT ADDITION - JOB_SECURITY_MEDIC = 14, // SKYRAT EDIT ADDITION - JOB_CORRECTIONS_OFFICER = 15, // SKYRAT EDIT ADDITION - JOB_DETECTIVE = 17, + JOB_SECURITY_MEDIC = 13, // SKYRAT EDIT ADDITION + JOB_CORRECTIONS_OFFICER = 14, // SKYRAT EDIT ADDITION + JOB_DETECTIVE = 15, // 20-29: Medbay JOB_CHIEF_MEDICAL_OFFICER = 20, JOB_CHEMIST = 21, diff --git a/code/modules/antagonists/ert/ert.dm b/code/modules/antagonists/ert/ert.dm index 9e2d27d67c0..6459c0e83fb 100644 --- a/code/modules/antagonists/ert/ert.dm +++ b/code/modules/antagonists/ert/ert.dm @@ -282,7 +282,7 @@ /datum/antagonist/ert/families/greet() . = ..() var/missiondesc - missiondesc += "
You are NOT a Nanotrasen Employee. You work for Sol Gov." + missiondesc += "
You are NOT a Nanotrasen Employee. You work for SolFed." missiondesc += "
You are NOT a deathsquad. You are here to help innocents escape violence, criminal activity, and other dangerous things." missiondesc += "
You are responding to emergency calls from the station for immediate SolFed Police assistance!\n" missiondesc += "
Your Mission:" diff --git a/code/modules/events/market_crash.dm b/code/modules/events/market_crash.dm index 6a5360ff616..b18003b2ea9 100644 --- a/code/modules/events/market_crash.dm +++ b/code/modules/events/market_crash.dm @@ -20,7 +20,7 @@ var/list/poss_reasons = list("the alignment of the moon and the sun",\ "some risky housing market outcomes",\ "The B.E.P.I.S. team's untimely downfall",\ - "speculative SolGov grants backfiring",\ + "speculative SolFed grants backfiring",\ "greatly exaggerated reports of Nanotrasen accountancy personnel committing mass suicide") //Skyrat Edit; original was "speculative Terragov grants backfiring" var/reason = pick(poss_reasons) priority_announce("Due to [reason], prices for on-station vendors will be increased for a short period.", "Nanotrasen Accounting Division") diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm index 657544c5ce7..6a7916c3ca4 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/code/modules/jobs/job_types/security_officer.dm @@ -7,7 +7,7 @@ faction = FACTION_STATION total_positions = 8 //Handled in /datum/controller/occupations/proc/setup_officer_positions() // SKYRAT EDIT: SET TO 8, WAS 5 spawn_positions = 8 //Handled in /datum/controller/occupations/proc/setup_officer_positions() // SKYRAT EDIT: SEE ABOVE - supervisors = "the head of security, and the head of your assigned department (if applicable)" // SKYRAT EDIT: Adds mention of the security sergeant. + supervisors = "the head of security, and the head of your assigned department (if applicable)" selection_color = "#ffeeee" minimal_player_age = 7 exp_requirements = 300 diff --git a/code/modules/modular_computers/file_system/programs/jobmanagement.dm b/code/modules/modular_computers/file_system/programs/jobmanagement.dm index 1d9726d0deb..27a52422a7f 100644 --- a/code/modules/modular_computers/file_system/programs/jobmanagement.dm +++ b/code/modules/modular_computers/file_system/programs/jobmanagement.dm @@ -20,8 +20,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) JOB_HEAD_OF_PERSONNEL, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, - JOB_SECURITY_SERGEANT, // SKYRAT EDIT ADD START - JOB_SECURITY_MEDIC, + JOB_SECURITY_MEDIC, // SKYRAT EDIT ADD START JOB_CLOWN, JOB_BLUESHIELD, JOB_NT_REP, // SKYRAT EDIT ADD END diff --git a/config/dynamic.json b/config/dynamic.json index fdd1d33e4d6..5f407131d45 100644 --- a/config/dynamic.json +++ b/config/dynamic.json @@ -30,8 +30,6 @@ "Warden", "Detective", "Security Medic", - "Security Sergeant", - "Civil Disputes Officer", "Head of Security", "Captain", "Nanotrasen Representative", diff --git a/config/jobs.txt b/config/jobs.txt index 0d9a83530e1..ec413fc05b8 100644 --- a/config/jobs.txt +++ b/config/jobs.txt @@ -72,7 +72,6 @@ Science Guard=2,2 # Security Warden=1,1 -Security Sergeant=1,1 Detective=2,2 Security Officer=6,6 Security Medic=1,1 diff --git a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm index 64fa7e7903f..9b07e54179c 100644 --- a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm +++ b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm @@ -46,6 +46,7 @@ assignment = "Blueshield" trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi' trim_state = "trim_blueshield" + sechud_icon_state = SECHUD_BLUESHIELD extra_access = list(ACCESS_SECURITY, ACCESS_BRIG, ACCESS_COURT, ACCESS_CARGO, ACCESS_GATEWAY) // Someone needs to come back and order these alphabetically, this is a nightmare minimal_access = list( ACCESS_FORENSICS_LOCKERS, ACCESS_SEC_DOORS, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_ENGINE, ACCESS_MAINT_TUNNELS, ACCESS_RESEARCH, @@ -59,6 +60,7 @@ assignment = "Nanotrasen Representative" trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi' trim_state = "trim_nanotrasenrepresentative" + sechud_icon_state = SECHUD_NT_REP extra_access = list() minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_MEDICAL, ACCESS_PSYCHOLOGY, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS, @@ -75,6 +77,7 @@ assignment = "Security Medic" trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi' trim_state = "trim_securitymedic" + sechud_icon_state = SECHUD_SECURITY_MEDIC extra_access = list(ACCESS_FORENSICS_LOCKERS) minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_MECH_SECURITY, ACCESS_MINERAL_STOREROOM, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP, ACCESS_MAINT_TUNNELS) @@ -92,6 +95,7 @@ assignment = "Vanguard Operative" trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi' trim_state = "trim_expeditionarytrooper" + sechud_icon_state = SECHUD_VANGUARD_OPERATIVE extra_access = list() minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_TELEPORTER, ACCESS_GATEWAY, ACCESS_TECH_STORAGE, ACCESS_CENT_GENERAL, ACCESS_RESEARCH, ACCESS_RND) @@ -101,6 +105,7 @@ assignment = "Corrections Officer" trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi' trim_state = "trim_brigoff" + sechud_icon_state = SECHUD_CORRECTIONS_OFFICER extra_access = list() minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP) @@ -112,6 +117,7 @@ assignment = "Barber" trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi' trim_state = "trim_barber" + sechud_icon_state = SECHUD_BARBER extra_access = list() minimal_access = list(ACCESS_THEATRE, ACCESS_MAINT_TUNNELS, ACCESS_BARBER, ACCESS_SERVICE) config_job = "barber" diff --git a/modular_skyrat/master_files/code/datums/id_trim/solgov.dm b/modular_skyrat/master_files/code/datums/id_trim/solfed.dm similarity index 54% rename from modular_skyrat/master_files/code/datums/id_trim/solgov.dm rename to modular_skyrat/master_files/code/datums/id_trim/solfed.dm index de8c41f521e..b2c540327cf 100644 --- a/modular_skyrat/master_files/code/datums/id_trim/solgov.dm +++ b/modular_skyrat/master_files/code/datums/id_trim/solfed.dm @@ -1,15 +1,18 @@ -/datum/id_trim/solgov +/datum/id_trim/solfed trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi' - assignment = "SolGov" - trim_state = "trim_solgov" + assignment = "SolFed" + trim_state = "trim_solfed" + sechud_icon_state = SECHUD_SOLFED /datum/id_trim/solgov/New() . = ..() access = SSid_access.get_region_access_list(list(REGION_CENTCOM, REGION_ALL_STATION)) -/datum/id_trim/solgov/liasion - assignment = "SolGov Liasion" +/datum/id_trim/solfed/liasion + assignment = "SolFed Liasion" + sechud_icon_state = SECHUD_SOLFED_LIASON /datum/id_trim/space_police //Overrides the normal /tg/ ERTSEC Icon, these guys aren't NT! trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi' - trim_state = "trim_solgov" + trim_state = "trim_spacepolice" + sechud_icon_state = SECHUD_SPACE_POLICE diff --git a/modular_skyrat/master_files/code/game/objects/items/cards_ids.dm b/modular_skyrat/master_files/code/game/objects/items/cards_ids.dm index d44bb24ed6d..79ca8499589 100644 --- a/modular_skyrat/master_files/code/game/objects/items/cards_ids.dm +++ b/modular_skyrat/master_files/code/game/objects/items/cards_ids.dm @@ -23,9 +23,9 @@ . = ..() AddElement(/datum/element/polychromic, list("#666666", "#CCBBAA", "#0000FF")) -//SOLGOV// -/obj/item/card/id/advanced/solgov - name = "solgov identification card" +//SOLFED// +/obj/item/card/id/advanced/solfed + name = "solfed identification card" icon = 'modular_skyrat/master_files/icons/obj/card.dmi' - icon_state = "card_solgov" - assigned_icon_state = "assigned_solgov" + icon_state = "card_solfed" + assigned_icon_state = "assigned_solfed" diff --git a/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/kill_pet.dm b/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/kill_pet.dm index 50d5138e449..2364c92de89 100644 --- a/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/kill_pet.dm +++ b/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/kill_pet.dm @@ -40,7 +40,7 @@ // Emag E-N so it overloads if(istype(target_pet, /mob/living/simple_animal/pet/dog/corgi/borgi)) name = "Emag the roboticist's most-prized borgi, E-N" - description = "We received an untracable contract from someone addressed 'ianfan2489@solgov.nt', they want the robotic clone of Ian dead- and it has to be dramatic. We will supply you with a cryptographic sequencer from our basic loadout options to shortcircuit E-N's safety, it will give you a single attempt to use it. Oh, and remember to run like hell when you do... " + description = "We received an untracable contract from someone addressed 'ianfan2489@solfed.nt', they want the robotic clone of Ian dead- and it has to be dramatic. We will supply you with a cryptographic sequencer from our basic loadout options to shortcircuit E-N's safety, it will give you a single attempt to use it. Oh, and remember to run like hell when you do... " telecrystal_reward = 3 // Because these are more complicated than 'kill the pet', the reward is bigger telecrystal_penalty = 3 // Same cost as an emag on sale diff --git a/modular_skyrat/master_files/icons/mob/huds/hud.dmi b/modular_skyrat/master_files/icons/mob/huds/hud.dmi index b67aa7e78de..d5fa8b0eba0 100644 Binary files a/modular_skyrat/master_files/icons/mob/huds/hud.dmi and b/modular_skyrat/master_files/icons/mob/huds/hud.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/card.dmi b/modular_skyrat/master_files/icons/obj/card.dmi index f7e6ee04953..0b5ad5e7ae5 100644 Binary files a/modular_skyrat/master_files/icons/obj/card.dmi and b/modular_skyrat/master_files/icons/obj/card.dmi differ diff --git a/modular_skyrat/modules/Midroundtraitor/code/event.dm b/modular_skyrat/modules/Midroundtraitor/code/event.dm index 2bfede9276e..66c24838962 100644 --- a/modular_skyrat/modules/Midroundtraitor/code/event.dm +++ b/modular_skyrat/modules/Midroundtraitor/code/event.dm @@ -2,7 +2,7 @@ name = "Lone Infiltrator" antag_datum = /datum/antagonist/traitor/infiltrator antag_flag = ROLE_LONE_INFILTRATOR - restricted_roles = list(JOB_CYBORG, JOB_AI, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_HEAD_OF_SECURITY, JOB_CAPTAIN, JOB_CORRECTIONS_OFFICER, JOB_VANGUARD_OPERATIVE, JOB_NT_REP, JOB_BLUESHIELD, JOB_CIVIL_DISPUTES_OFFICER, JOB_SECURITY_SERGEANT, JOB_ORDERLY, JOB_BOUNCER, JOB_CUSTOMS_AGENT, JOB_ENGINEERING_GUARD, JOB_SCIENCE_GUARD) //SKYRAT EDIT - Sec_haul + restricted_roles = list(JOB_CYBORG, JOB_AI, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_HEAD_OF_SECURITY, JOB_CAPTAIN, JOB_CORRECTIONS_OFFICER, JOB_VANGUARD_OPERATIVE, JOB_NT_REP, JOB_BLUESHIELD, JOB_ORDERLY, JOB_BOUNCER, JOB_CUSTOMS_AGENT, JOB_ENGINEERING_GUARD, JOB_SCIENCE_GUARD) //SKYRAT EDIT - Sec_haul required_candidates = 1 weight = 5 //Slightly less common than normal midround traitors. cost = 15 //But also slightly more costly. diff --git a/modular_skyrat/modules/admin/code/sooc.dm b/modular_skyrat/modules/admin/code/sooc.dm index e428eb81ef4..2e32a2bf27f 100644 --- a/modular_skyrat/modules/admin/code/sooc.dm +++ b/modular_skyrat/modules/admin/code/sooc.dm @@ -16,7 +16,7 @@ GLOBAL_LIST_EMPTY(ckey_to_sooc_name) if(!mob) return - var/static/list/job_lookup = list(JOB_CAPTAIN=TRUE, JOB_HEAD_OF_SECURITY=TRUE, JOB_WARDEN=TRUE, JOB_DETECTIVE=TRUE, JOB_SECURITY_OFFICER=TRUE, JOB_CORRECTIONS_OFFICER=TRUE, JOB_SECURITY_MEDIC=TRUE, JOB_SECURITY_SERGEANT=TRUE, JOB_CIVIL_DISPUTES_OFFICER=TRUE, JOB_BLUESHIELD=TRUE, JOB_ENGINEERING_GUARD=TRUE, JOB_ORDERLY=TRUE, JOB_SCIENCE_GUARD=TRUE, JOB_CUSTOMS_AGENT=TRUE, JOB_BOUNCER=TRUE) + var/static/list/job_lookup = list(JOB_CAPTAIN=TRUE, JOB_HEAD_OF_SECURITY=TRUE, JOB_WARDEN=TRUE, JOB_DETECTIVE=TRUE, JOB_SECURITY_OFFICER=TRUE, JOB_CORRECTIONS_OFFICER=TRUE, JOB_SECURITY_MEDIC=TRUE, JOB_BLUESHIELD=TRUE, JOB_ENGINEERING_GUARD=TRUE, JOB_ORDERLY=TRUE, JOB_SCIENCE_GUARD=TRUE, JOB_CUSTOMS_AGENT=TRUE, JOB_BOUNCER=TRUE) if(!holder) var/job = mob?.mind.assigned_role.title if(!job || !job_lookup[job]) diff --git a/modular_skyrat/modules/alternative_job_titles/code/alt_job_titles.dm b/modular_skyrat/modules/alternative_job_titles/code/alt_job_titles.dm index d014a040a6c..b7618f63814 100644 --- a/modular_skyrat/modules/alternative_job_titles/code/alt_job_titles.dm +++ b/modular_skyrat/modules/alternative_job_titles/code/alt_job_titles.dm @@ -146,9 +146,6 @@ /datum/job/security_officer alt_titles = list("Security Officer", "Security Operative", "Peacekeeper") -/datum/job/security_sergeant - alt_titles = list("Security Sergeant", "Security Squad Leader", "Security Task Force Leader", "Security Fireteam Leader", "Security Enforcer") //why are these all so edgy, you're a mall cop - /datum/job/shaft_miner alt_titles = list("Shaft Miner", "Excavator", "Spelunker", "Drill Technician", "Prospector") diff --git a/modular_skyrat/modules/customization/modules/culture/faction/faction_generic.dm b/modular_skyrat/modules/customization/modules/culture/faction/faction_generic.dm index 8f65347022e..dfdbfaeaa96 100644 --- a/modular_skyrat/modules/customization/modules/culture/faction/faction_generic.dm +++ b/modular_skyrat/modules/customization/modules/culture/faction/faction_generic.dm @@ -18,6 +18,7 @@ technology, means their installations are often considered unsafe and hazardous." economic_power = 1.2 +//To-Do: change to SolFed /datum/cultural_info/faction/solgov name = "Sol Central Government" description = "The Sol Central Government, commonly referred to as SolGov or the SCG, is a federal republic \ diff --git a/modular_skyrat/modules/customization/modules/jobs/_job.dm b/modular_skyrat/modules/customization/modules/jobs/_job.dm index 6496c048ce4..8d02a4937ee 100644 --- a/modular_skyrat/modules/customization/modules/jobs/_job.dm +++ b/modular_skyrat/modules/customization/modules/jobs/_job.dm @@ -58,15 +58,9 @@ /datum/job/warden banned_quirks = list(SEC_RESTRICTED_QUIRKS) -/datum/job/security_sergeant - banned_quirks = list(SEC_RESTRICTED_QUIRKS) - /datum/job/security_medic banned_quirks = list(SEC_RESTRICTED_QUIRKS) -/datum/job/junior_officer - banned_quirks = list(SEC_RESTRICTED_QUIRKS) - /datum/job/blueshield banned_quirks = list(SEC_RESTRICTED_QUIRKS) diff --git a/modular_skyrat/modules/goofsec/code/department_guards.dm b/modular_skyrat/modules/goofsec/code/department_guards.dm index de5b7ee4280..8b5ece9b543 100644 --- a/modular_skyrat/modules/goofsec/code/department_guards.dm +++ b/modular_skyrat/modules/goofsec/code/department_guards.dm @@ -124,6 +124,7 @@ assignment = "Orderly" trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi' trim_state = "trim_orderly" + sechud_icon_state = SECHUD_ORDERLY extra_access = list(ACCESS_SEC_DOORS, ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM) minimal_access = list(ACCESS_SEC_DOORS, ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM) config_job = "orderly" @@ -191,6 +192,7 @@ assignment = "Science Guard" trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi' trim_state = "trim_calhoun" + sechud_icon_state = SECHUD_SCIENCE_GUARD extra_access = list(ACCESS_SEC_DOORS, ACCESS_ROBOTICS, ACCESS_RND, ACCESS_ORDNANCE, ACCESS_ORDNANCE_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_MECH_SCIENCE, ACCESS_MINERAL_STOREROOM, ACCESS_TECH_STORAGE, ACCESS_GENETICS, ACCESS_AUX_BASE) minimal_access = list(ACCESS_SEC_DOORS, ACCESS_ROBOTICS, ACCESS_RND, ACCESS_ORDNANCE, ACCESS_ORDNANCE_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, @@ -266,6 +268,7 @@ assignment = "Bouncer" trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi' trim_state = "trim_bouncer" + sechud_icon_state = SECHUD_BOUNCER extra_access = list(ACCESS_SEC_DOORS, ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM, ACCESS_THEATRE) minimal_access = list(ACCESS_SEC_DOORS, ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM, ACCESS_THEATRE, ACCESS_SERVICE) config_job = "bouncer" @@ -333,6 +336,7 @@ assignment = "Customs Agent" trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi' trim_state = "trim_customs" + sechud_icon_state = SECHUD_CUSTOMS_AGENT extra_access = list(ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM) minimal_access = list(ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM) config_job = "customs_agent" @@ -400,6 +404,7 @@ assignment = "Engineering Guard" trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi' trim_state = "trim_engiguard" + sechud_icon_state = SECHUD_ENGINEERING_GUARD extra_access = list(ACCESS_SEC_DOORS, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_MECH_ENGINE, ACCESS_AUX_BASE, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_TCOMSAT, ACCESS_MINERAL_STOREROOM) minimal_access = list(ACCESS_SEC_DOORS, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_MECH_ENGINE, ACCESS_AUX_BASE, diff --git a/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm b/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm index 262f08a46a2..92d1fef78d5 100644 --- a/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm +++ b/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm @@ -467,3 +467,16 @@ if(H.jumpsuit_style == PREF_SKIRT) to_chat(H, span_alertwarning("Lopland Peacekeeper uniforms don't include a Skirt variant! You've been equipped with a jumpsuit instead.")) uniform = /obj/item/clothing/under/rank/security/officer + +//PDA Greyscale Overrides +/obj/item/pda/security + greyscale_colors = "#2B356D#1E1E1E" + +/obj/item/pda/detective + greyscale_colors = "#90714F#1E1E1E" + +/obj/item/pda/warden + greyscale_colors = "#2F416E#1E1E1E#ACACAC" + +/obj/item/pda/heads/hos + greyscale_colors = "#2B356D#1E1E1E" diff --git a/modular_skyrat/modules/goofsec/code/sol_fed.dm b/modular_skyrat/modules/goofsec/code/sol_fed.dm index 35d4cbc1970..e806533b03c 100644 --- a/modular_skyrat/modules/goofsec/code/sol_fed.dm +++ b/modular_skyrat/modules/goofsec/code/sol_fed.dm @@ -172,6 +172,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list( var/obj/item/gangster_cellphone/phone = new() // biggest gang in the city phone.gang_id = cell_phone_number phone.name = "[cell_phone_number] branded cell phone" + phone.w_class = WEIGHT_CLASS_SMALL //They get that COMPACT phone hell yea var/phone_equipped = phone.equip_to_best_slot(cop) if(!phone_equipped) to_chat(cop, "Your [phone.name] has been placed at your feet.") @@ -315,14 +316,14 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list( belt = /obj/item/gun/energy/disabler r_pocket = /obj/item/lighter l_pocket = /obj/item/restraints/handcuffs - id = /obj/item/card/id/advanced/solgov + id = /obj/item/card/id/advanced/solfed backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/storage/box/handcuffs = 1, /obj/item/melee/baton/security/loaded = 1, /obj/item/solfed_reporter/swat_caller = 1, /obj/item/beamout_tool = 1) - id_trim = /datum/id_trim/solgov + id_trim = /datum/id_trim/solfed /datum/antagonist/ert/request_911/atmos name = "Breach Control Technician" @@ -336,23 +337,23 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list( uniform = /obj/item/clothing/under/rank/engineering/engineer/hazard shoes = /obj/item/clothing/shoes/workboots ears = /obj/item/radio/headset/headset_eng - head = /obj/item/clothing/head/hardhat/red mask = /obj/item/clothing/mask/gas/atmos belt = /obj/item/storage/belt/utility/full suit_store = /obj/item/tank/internals/oxygen/yellow - id = /obj/item/card/id/advanced/solgov + id = /obj/item/card/id/advanced/solfed + l_pocket = /obj/item/extinguisher/mini backpack_contents = list(/obj/item/storage/box/survival = 1, - /obj/item/extinguisher = 2, + /obj/item/extinguisher = 1, /obj/item/storage/box/smart_metal_foam = 2, /obj/item/solfed_reporter/swat_caller = 1, /obj/item/beamout_tool = 1) - id_trim = /datum/id_trim/solgov + id_trim = /datum/id_trim/solfed ////////////////////////////// /// Breach Control MODsuit /// /obj/item/mod/control/pre_equipped/atmospheric/breach_control //Just a different kit as 811 wont be raiding Robotics; otherwise the same look (For now???) theme = /datum/mod_theme/atmospheric - ui_theme = "neutral" //Le yellow Sol + theme = /datum/mod_theme/atmospheric/breach_control applied_cell = /obj/item/stock_parts/cell/super initial_modules = list( /obj/item/mod/module/storage/large_capacity, @@ -363,6 +364,9 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list( /obj/item/mod/module/tether, /obj/item/mod/module/visor/meson, ) + +/datum/mod_theme/atmospheric/breach_control //Implement a unique skin for this eventually + ui_theme = "neutral" //Le yellow Sol ////////////////////////////// ////////////////////////////// @@ -379,7 +383,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list( shoes = /obj/item/clothing/shoes/sneakers/white ears = /obj/item/radio/headset/headset_med head = /obj/item/clothing/head/soft/paramedic - id = /obj/item/card/id/advanced/solgov + id = /obj/item/card/id/advanced/solfed suit = /obj/item/clothing/suit/toggle/labcoat/paramedic gloves = /obj/item/clothing/gloves/color/latex/nitrile belt = /obj/item/storage/belt/medical/paramedic @@ -390,7 +394,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list( /obj/item/solfed_reporter/swat_caller = 1, /obj/item/beamout_tool = 1) - id_trim = /datum/id_trim/solgov + id_trim = /datum/id_trim/solfed /datum/antagonist/ert/request_911/condom_destroyer name = "Armed S.W.A.T. Officer" @@ -426,7 +430,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list( suit = /obj/item/clothing/suit/armor/riot r_pocket = /obj/item/lighter l_pocket = /obj/item/restraints/handcuffs - id = /obj/item/card/id/advanced/solgov + id = /obj/item/card/id/advanced/solfed l_hand = /obj/item/gun/ballistic/shotgun/riot backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/storage/box/handcuffs = 1, @@ -435,7 +439,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list( /obj/item/solfed_reporter/treason_reporter = 1, /obj/item/beamout_tool = 1) - id_trim = /datum/id_trim/solgov + id_trim = /datum/id_trim/solfed /datum/antagonist/ert/request_911/treason_destroyer name = "Sol Federation Military" @@ -471,14 +475,14 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list( glasses = /obj/item/clothing/glasses/sunglasses ears = /obj/item/radio/headset/headset_sec/alt l_pocket = /obj/item/restraints/handcuffs - id = /obj/item/card/id/advanced/solgov + id = /obj/item/card/id/advanced/solfed r_hand = /obj/item/gun/ballistic/automatic/assault_rifle/m16 backpack_contents = list(/obj/item/storage/box/handcuffs = 1, /obj/item/melee/baton/security/loaded = 1, /obj/item/ammo_box/magazine/m16 = 4 ) - id_trim = /datum/id_trim/solgov + id_trim = /datum/id_trim/solfed /obj/item/solfed_reporter name = "SolFed Reporter" diff --git a/modular_skyrat/modules/icspawning/code/cards_ids.dm b/modular_skyrat/modules/icspawning/code/cards_ids.dm index 7a4c2edff7e..35911a7c0ca 100644 --- a/modular_skyrat/modules/icspawning/code/cards_ids.dm +++ b/modular_skyrat/modules/icspawning/code/cards_ids.dm @@ -12,3 +12,4 @@ assignment = "Bluespace Technician" trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi' trim_state = "trim_bluespacetech" + sechud_icon_state = SECHUD_SCRAMBLED diff --git a/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm b/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm index 6ffddf6da7c..dece7e71ffb 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm @@ -73,13 +73,13 @@ name = "Peacekeeper jacket" item_path = /obj/item/clothing/suit/armor/vest/warden/rax ckeywhitelist = list("raxraus") - restricted_roles = list(JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER,JOB_CIVIL_DISPUTES_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_SERGEANT, JOB_SECURITY_MEDIC, JOB_CORRECTIONS_OFFICER) + restricted_roles = list(JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_MEDIC, JOB_CORRECTIONS_OFFICER) /datum/loadout_item/under/jumpsuit/rax_banded_uniform name = "Banded Uniform" item_path = /obj/item/clothing/under/rank/security/rax ckeywhitelist = list("raxraus") - restricted_roles = list(JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER,JOB_CIVIL_DISPUTES_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_SERGEANT, JOB_SECURITY_MEDIC, JOB_CORRECTIONS_OFFICER) + restricted_roles = list(JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_MEDIC, JOB_CORRECTIONS_OFFICER) /datum/loadout_item/suit/rax_aerostatic_jacket name = "Navy Aerostatic Jacket" @@ -105,19 +105,19 @@ name = "HepUnit Standard Helmet" item_path = /obj/item/clothing/head/helmet/sec/peacekeeper/jax ckeywhitelist = list("candlejax") - restricted_roles = list(JOB_VANGUARD_OPERATIVE,JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER,JOB_CIVIL_DISPUTES_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_SERGEANT, JOB_SECURITY_MEDIC, JOB_CORRECTIONS_OFFICER) + restricted_roles = list(JOB_VANGUARD_OPERATIVE,JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_MEDIC, JOB_CORRECTIONS_OFFICER) /datum/loadout_item/head/emissionhelm name = "Emission's Helmet" item_path = /obj/item/clothing/head/helmet/space/plasmaman/candlejax ckeywhitelist = list("candlejax") - restricted_roles = list(JOB_SHAFT_MINER,JOB_VANGUARD_OPERATIVE,JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER,JOB_CIVIL_DISPUTES_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_SERGEANT, JOB_SECURITY_MEDIC, JOB_CORRECTIONS_OFFICER) + restricted_roles = list(JOB_SHAFT_MINER, JOB_VANGUARD_OPERATIVE, JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_MEDIC, JOB_CORRECTIONS_OFFICER) /datum/loadout_item/under/jumpsuit/emissionsuit name = "Emission's Suit" item_path = /obj/item/clothing/under/plasmaman/security/candlejax ckeywhitelist = list("candlejax") - restricted_roles = list(JOB_SHAFT_MINER,JOB_VANGUARD_OPERATIVE,JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER,JOB_CIVIL_DISPUTES_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_SERGEANT, JOB_SECURITY_MEDIC, JOB_CORRECTIONS_OFFICER) + restricted_roles = list(JOB_SHAFT_MINER, JOB_VANGUARD_OPERATIVE, JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_MEDIC, JOB_CORRECTIONS_OFFICER) /datum/loadout_item/head/avipilot name = "Smuggler's Flying Cap" diff --git a/modular_skyrat/modules/modular_ert/code/trauma_team/truama_team_outfit.dm b/modular_skyrat/modules/modular_ert/code/trauma_team/truama_team_outfit.dm index 03c8df9648c..e7adf45e4ea 100644 --- a/modular_skyrat/modules/modular_ert/code/trauma_team/truama_team_outfit.dm +++ b/modular_skyrat/modules/modular_ert/code/trauma_team/truama_team_outfit.dm @@ -50,8 +50,14 @@ new /obj/item/weaponcell/medical/utility/temperature(src) new /obj/item/weaponcell/medical/utility/bed(src) +/datum/id_trim/centcom/ert/medical/ntrauma + assignment = "Trauma Team Specialist" + trim_state = "trim_highcleric" //This is the CMO trim for the RPG Titles; considering its 'angelic' sprite, its fitting for these guardian angels + sechud_icon_state = SECHUD_SCRAMBLED + /obj/item/card/id/advanced/centcom/ert/medical/ntrauma registered_name = "Trauma Team Specialist" + trim = /datum/id_trim/centcom/ert/medical/ntrauma icon_state = "battlecruisercaller" //Read desc desc = "A semi-standard black Identification card rigged with what appears to be a small transmitter wired to a small disk - presumably filled with access tokens. Not NT standard, sure, but effectively the same card as their ERTs." diff --git a/modular_skyrat/modules/novaya_ert/code/id.dm b/modular_skyrat/modules/novaya_ert/code/id.dm index aa8c6034b1c..1927f6da01d 100644 --- a/modular_skyrat/modules/novaya_ert/code/id.dm +++ b/modular_skyrat/modules/novaya_ert/code/id.dm @@ -9,6 +9,7 @@ assignment = "Novaya Rossiyskaya Imperiya Soldier" trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi' trim_state = "trim_nri" + sechud_icon_state = "hud_nri" /datum/id_trim/nri/New() . = ..() @@ -18,6 +19,7 @@ /datum/id_trim/nri/commander assignment = "Novaya Rossiyskaya Imperiya Platoon Commander" trim_state = "trim_nri_commander" + sechud_icon_state = "hud_nri_commander" /datum/id_trim/nri/heavy assignment = "Novaya Rossiyskaya Imperiya Heavy Soldier" diff --git a/modular_skyrat/modules/novaya_ert/code/outfit.dm b/modular_skyrat/modules/novaya_ert/code/outfit.dm index c54193dd069..b1c09bfe0dc 100644 --- a/modular_skyrat/modules/novaya_ert/code/outfit.dm +++ b/modular_skyrat/modules/novaya_ert/code/outfit.dm @@ -38,3 +38,6 @@ id_trim = /datum/id_trim/nri/commander +/datum/outfit/centcom/ert/nri/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + return + //Two reasons for this; one, Russians arent NT and dont need implants used mostly for NT-sympathizers. Two, the HuD looks ugly with the blue mindshield outline. diff --git a/modular_skyrat/modules/oneclickantag/code/oneclickantag.dm b/modular_skyrat/modules/oneclickantag/code/oneclickantag.dm index 6fa0afbdbf1..cabb702702a 100644 --- a/modular_skyrat/modules/oneclickantag/code/oneclickantag.dm +++ b/modular_skyrat/modules/oneclickantag/code/oneclickantag.dm @@ -84,7 +84,7 @@ If anyone can figure out how to get Obsessed to work I would be very appreciativ /datum/admins/ var/MAKEANTAG_RESTRICTLIST = list() - var/MAKEANTAG_PL_DEFAULT_SECURITY = list(JOB_PRISONER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_HEAD_OF_SECURITY, JOB_CAPTAIN, JOB_CORRECTIONS_OFFICER, JOB_CIVIL_DISPUTES_OFFICER, JOB_SECURITY_MEDIC, JOB_SECURITY_SERGEANT, JOB_BLUESHIELD, JOB_ORDERLY, JOB_BOUNCER, JOB_CUSTOMS_AGENT, JOB_ENGINEERING_GUARD, JOB_SCIENCE_GUARD) + var/MAKEANTAG_PL_DEFAULT_SECURITY = list(JOB_PRISONER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_HEAD_OF_SECURITY, JOB_CAPTAIN, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC, JOB_BLUESHIELD, JOB_ORDERLY, JOB_BOUNCER, JOB_CUSTOMS_AGENT, JOB_ENGINEERING_GUARD, JOB_SCIENCE_GUARD) var/MAKEANTAG_PL_DEFAULT_HEADS = list(JOB_CAPTAIN,JOB_HEAD_OF_PERSONNEL,JOB_RESEARCH_DIRECTOR,JOB_CHIEF_ENGINEER,JOB_CHIEF_MEDICAL_OFFICER,JOB_HEAD_OF_SECURITY,JOB_QUARTERMASTER) var/MAKEANTAG_PL_DEFAULT_SILICON = list(JOB_AI, JOB_CYBORG) diff --git a/modular_skyrat/modules/protected_roles/code/antag_restricted_jobs.dm b/modular_skyrat/modules/protected_roles/code/antag_restricted_jobs.dm index 4a72f9e2262..6f686380053 100644 --- a/modular_skyrat/modules/protected_roles/code/antag_restricted_jobs.dm +++ b/modular_skyrat/modules/protected_roles/code/antag_restricted_jobs.dm @@ -27,18 +27,12 @@ /datum/job/blueshield antagonist_restricted = TRUE -/datum/job/security_sergeant - antagonist_restricted = TRUE - /datum/job/security_medic antagonist_restricted = TRUE /datum/job/brigoff antagonist_restricted = TRUE -/datum/job/junior_officer - antagonist_restricted = TRUE - /datum/job/orderly antagonist_restricted = TRUE diff --git a/modular_skyrat/modules/sec_haul/code/junior_officer/pepperball_gun.dm b/modular_skyrat/modules/sec_haul/code/guns/pepperball_gun.dm similarity index 100% rename from modular_skyrat/modules/sec_haul/code/junior_officer/pepperball_gun.dm rename to modular_skyrat/modules/sec_haul/code/guns/pepperball_gun.dm diff --git a/modular_skyrat/modules/sec_haul/code/junior_officer/junior_officer.dm b/modular_skyrat/modules/sec_haul/code/junior_officer/junior_officer.dm deleted file mode 100644 index cd64bdc340e..00000000000 --- a/modular_skyrat/modules/sec_haul/code/junior_officer/junior_officer.dm +++ /dev/null @@ -1,3 +0,0 @@ -/obj/effect/landmark/start/junior_officer - name = "Civil Disputes Officer" - icon_state = "Security Officer" diff --git a/modular_skyrat/modules/sec_haul/code/junior_officer/junior_officer_clothes.dm b/modular_skyrat/modules/sec_haul/code/junior_officer/junior_officer_clothes.dm deleted file mode 100644 index 39c9c4ead07..00000000000 --- a/modular_skyrat/modules/sec_haul/code/junior_officer/junior_officer_clothes.dm +++ /dev/null @@ -1,30 +0,0 @@ -/obj/item/clothing/head/soft/black/junior_officer - name = "peacekeeper junior officer cap" - desc = "A junior officers cap, wearing this increases your robustness, apparently." - icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi' - icon_state = "juniorsoft" - soft_type = "junior" - mutant_variants = NONE - -/obj/item/clothing/under/rank/security/peacekeeper/junior - name = "peacekeeper junior officer poloshirt" - desc = "A sleek peackeeper poloshirt and pants, this one is special. It's for junior officers." - icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' - worn_icon_digi = 'modular_skyrat/master_files/icons/mob/clothing/uniform_digi.dmi' - icon_state = "junior_officer" - -/obj/item/clothing/suit/toggle/labcoat/junior_officer - name = "junior officer coat" - desc = "An Armadyne coat that offers very minimal protection." - icon = 'modular_skyrat/master_files/icons/obj/clothing/suits.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suit.dmi' - icon_state = "juniorjacket" - inhand_icon_state = "jacket" - blood_overlay_type = "coat" - body_parts_covered = CHEST|ARMS - allowed = list(/obj/item/gun/ballistic/automatic/pistol/pepperball, /obj/item/melee/baton) - armor = list(MELEE = 15, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 0, BIO = 50, FIRE = 50, ACID = 50) - toggle_noun = "zipper" - mutant_variants = NONE diff --git a/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm b/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm index bd6c2a11efa..9eb438317f7 100644 --- a/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm +++ b/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm @@ -24,6 +24,23 @@ icon_state = "beret" greyscale_colors = "#EAEAEA" +/obj/item/clothing/head/soft/black/junior_officer + name = "peacekeeper junior officer cap" + desc = "A junior officers cap, wearing this increases your robustness, apparently." + icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi' + icon_state = "juniorsoft" + soft_type = "junior" + mutant_variants = NONE + +/obj/item/clothing/head/sec/peacekeeper/sergeant + name = "peacekeeper sergeant hat" + desc = "A drill sergeants cap, wearing this increases your loudness. So they say." + icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi' + icon_state = "peacekeeper_sergeant_cap" + mutant_variants = NONE + /obj/item/clothing/head/hos/beret/peacekeeper name = "head of security's peacekeeper beret" desc = "A special beret with the Head of Security's insignia emblazoned on it. A symbol of excellence, a badge of courage, a mark of distinction." @@ -64,6 +81,19 @@ name = "blue peacekeeper uniform" icon_state = "bsecurity" +/obj/item/clothing/under/rank/security/peacekeeper/junior + name = "peacekeeper junior officer poloshirt" + desc = "A sleek peackeeper poloshirt and pants, this one is special. It's for junior officers." + icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' + worn_icon_digi = 'modular_skyrat/master_files/icons/mob/clothing/uniform_digi.dmi' + icon_state = "junior_officer" + +/obj/item/clothing/under/rank/security/peacekeeper/sergeant + name = "peacekeeper sergeant uniform" + desc = "A sleek peackeeper uniform, signifying the rank of Sergeant." + icon_state = "peacekeeper_sergeant" + /obj/item/clothing/under/rank/security/warden/peacekeeper name = "peacekeeper wardens suit" desc = "A formal security suit for officers complete with Armadyne belt buckle." @@ -98,6 +128,20 @@ icon_state = "peacekeeper_black" worn_icon_state = "peacekeeper_black" +/obj/item/clothing/suit/toggle/labcoat/junior_officer + name = "junior officer coat" + desc = "An Armadyne coat that offers very minimal protection." + icon = 'modular_skyrat/master_files/icons/obj/clothing/suits.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suit.dmi' + icon_state = "juniorjacket" + inhand_icon_state = "jacket" + blood_overlay_type = "coat" + body_parts_covered = CHEST|ARMS + allowed = list(/obj/item/gun/ballistic/automatic/pistol/pepperball, /obj/item/melee/baton) + armor = list(MELEE = 15, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 0, BIO = 50, FIRE = 50, ACID = 50) + toggle_noun = "zipper" + mutant_variants = NONE + /obj/item/clothing/suit/armor/hos/trenchcoat/peacekeeper name = "armored peacekeeper trenchcoat" desc = "A trenchcoat enhanced with a special lightweight kevlar. The epitome of tactical plainclothes." diff --git a/modular_skyrat/modules/sec_haul/code/security_sergeant/secseg_clothes.dm b/modular_skyrat/modules/sec_haul/code/security_sergeant/secseg_clothes.dm deleted file mode 100644 index 5ad5be83946..00000000000 --- a/modular_skyrat/modules/sec_haul/code/security_sergeant/secseg_clothes.dm +++ /dev/null @@ -1,13 +0,0 @@ -/obj/item/clothing/head/sec/peacekeeper/sergeant - name = "peacekeeper sergeant hat" - desc = "A drill sergeants cap, wearing this increases your loudness. So they say." - icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi' - icon_state = "peacekeeper_sergeant_cap" - mutant_variants = NONE - -/obj/item/clothing/under/rank/security/peacekeeper/sergeant - name = "peacekeeper sergeant uniform" - desc = "A sleek peackeeper uniform, this one is special. It's for sergeants." - icon_state = "peacekeeper_sergeant" - diff --git a/tgstation.dme b/tgstation.dme index d0dc664b493..de895f540fb 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4362,7 +4362,7 @@ #include "modular_skyrat\master_files\code\datums\ert.dm" #include "modular_skyrat\master_files\code\datums\components\fullauto.dm" #include "modular_skyrat\master_files\code\datums\id_trim\jobs.dm" -#include "modular_skyrat\master_files\code\datums\id_trim\solgov.dm" +#include "modular_skyrat\master_files\code\datums\id_trim\solfed.dm" #include "modular_skyrat\master_files\code\datums\id_trim\syndicate.dm" #include "modular_skyrat\master_files\code\datums\martial\cqcplus.dm" #include "modular_skyrat\master_files\code\datums\mutations\chameleon.dm" @@ -5314,11 +5314,9 @@ #include "modular_skyrat\modules\sec_haul\code\guns\bullets.dm" #include "modular_skyrat\modules\sec_haul\code\guns\gun_spawns.dm" #include "modular_skyrat\modules\sec_haul\code\guns\guns.dm" +#include "modular_skyrat\modules\sec_haul\code\guns\pepperball_gun.dm" #include "modular_skyrat\modules\sec_haul\code\guns\token_system\gunsets.dm" #include "modular_skyrat\modules\sec_haul\code\guns\token_system\token_system.dm" -#include "modular_skyrat\modules\sec_haul\code\junior_officer\junior_officer.dm" -#include "modular_skyrat\modules\sec_haul\code\junior_officer\junior_officer_clothes.dm" -#include "modular_skyrat\modules\sec_haul\code\junior_officer\pepperball_gun.dm" #include "modular_skyrat\modules\sec_haul\code\misc\ai_module.dm" #include "modular_skyrat\modules\sec_haul\code\misc\bullet_drive.dm" #include "modular_skyrat\modules\sec_haul\code\misc\decals.dm" @@ -5332,7 +5330,6 @@ #include "modular_skyrat\modules\sec_haul\code\peacekeeper\peacekeeper_lockers.dm" #include "modular_skyrat\modules\sec_haul\code\security_medic\secmed_clothes.dm" #include "modular_skyrat\modules\sec_haul\code\security_medic\security_medic.dm" -#include "modular_skyrat\modules\sec_haul\code\security_sergeant\secseg_clothes.dm" #include "modular_skyrat\modules\self_actualization_device\code\self_actualization_device.dm" #include "modular_skyrat\modules\server_overflow\code\chat_link.dm" #include "modular_skyrat\modules\server_overflow\code\client_procs.dm"