diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index 15c46fabbb3..3c80641a25b 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -6645,7 +6645,6 @@ /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 }, -/obj/effect/landmark/start/security_medic, /turf/open/floor/iron/white/smooth_edge, /area/station/security/medical) "caV" = ( @@ -9663,7 +9662,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/bot, -/obj/effect/landmark/start/security_medic, /obj/effect/landmark/event_spawn, /turf/open/floor/iron/white/smooth_large, /area/station/security/medical) @@ -12303,7 +12301,6 @@ /area/station/cargo/storage) "dGX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/start/security_medic, /obj/effect/turf_decal/trimline/dark/filled/corner{ dir = 1 }, @@ -26524,7 +26521,6 @@ /obj/structure/chair/office{ dir = 1 }, -/obj/effect/landmark/start/security_medic, /turf/open/floor/glass/reinforced, /area/station/security/office) "hGr" = ( @@ -32081,7 +32077,6 @@ /obj/effect/turf_decal/trimline/red/filled/line{ dir = 10 }, -/obj/structure/closet/secure_closet/security_medic, /obj/effect/turf_decal/bot, /turf/open/floor/iron/white, /area/station/security/medical) @@ -86234,7 +86229,6 @@ /obj/effect/turf_decal/siding/red{ dir = 4 }, -/obj/effect/landmark/start/security_medic, /turf/open/floor/iron/dark/smooth_edge{ dir = 4 }, diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index 2aa16b5c293..f411b0867bf 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -53,7 +53,6 @@ #define JOB_SECURITY_OFFICER_SCIENCE "Security Officer (Science)" #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 //Engineering #define JOB_STATION_ENGINEER "Station Engineer" #define JOB_ATMOSPHERIC_TECHNICIAN "Atmospheric Technician" diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index 87058b3a840..83883ce08b4 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -108,9 +108,8 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) JOB_SECURITY_OFFICER_SCIENCE = 15, JOB_SECURITY_OFFICER_SUPPLY = 16, */ - JOB_SECURITY_MEDIC = 13, // SKYRAT EDIT ADDITION - JOB_CORRECTIONS_OFFICER = 14, // SKYRAT EDIT ADDITION - JOB_DETECTIVE = 15, + JOB_CORRECTIONS_OFFICER = 13, // SKYRAT EDIT ADDITION + JOB_DETECTIVE = 14, // 20-29: Medbay JOB_CHIEF_MEDICAL_OFFICER = 20, JOB_CHEMIST = 21, diff --git a/code/modules/modular_computers/file_system/programs/jobmanagement.dm b/code/modules/modular_computers/file_system/programs/jobmanagement.dm index 784a434a94d..d3c0423ce1c 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_MEDIC, // SKYRAT EDIT ADD START - JOB_CLOWN, + JOB_CLOWN, // SKYRAT EDIT ADD START JOB_BLUESHIELD, JOB_NT_REP, // SKYRAT EDIT ADD END JOB_CHIEF_ENGINEER, diff --git a/config/dynamic.json b/config/dynamic.json index 8bd2e8d4ff7..b968b228ce5 100644 --- a/config/dynamic.json +++ b/config/dynamic.json @@ -29,7 +29,6 @@ "Security Officer", "Warden", "Detective", - "Security Medic", "Head of Security", "Captain", "Nanotrasen Consultant", diff --git a/config/jobs.txt b/config/jobs.txt index 41c0c00d377..3b393782222 100644 --- a/config/jobs.txt +++ b/config/jobs.txt @@ -74,7 +74,6 @@ Science Guard=2,2 Warden=1,1 Detective=2,2 Security Officer=6,6 -Security Medic=1,1 Corrections Officer=2,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 049d619b0e0..b26e823b0e0 100644 --- a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm +++ b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm @@ -78,24 +78,6 @@ minimal_wildcard_access = list(ACCESS_CAPTAIN, ACCESS_CENT_GENERAL) template_access = list(ACCESS_CAPTAIN, ACCESS_CHANGE_IDS) -/datum/id_trim/job/security_medic - assignment = "Security Medic" - trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi' - trim_state = "trim_securitymedic" - department_color = COLOR_ASSEMBLY_BLACK - subdepartment_color = COLOR_ASSEMBLY_BLACK - sechud_icon_state = SECHUD_SECURITY_MEDIC - extra_access = list(ACCESS_DETECTIVE) - minimal_access = list(ACCESS_SECURITY, ACCESS_BRIG_ENTRANCE, ACCESS_BRIG, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_MECH_SECURITY, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS) - template_access = list(ACCESS_CAPTAIN, ACCESS_HOS, ACCESS_CHANGE_IDS) - -/datum/id_trim/job/security_medic/New() - . = ..() - - // Config check for if sec has maint access. - if(CONFIG_GET(flag/security_has_maint_access)) - access |= list(ACCESS_MAINT_TUNNELS) - /datum/id_trim/job/corrections_officer assignment = "Corrections Officer" trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi' diff --git a/modular_skyrat/master_files/icons/mob/clothing/suits/armor.dmi b/modular_skyrat/master_files/icons/mob/clothing/suits/armor.dmi index f4e7fd44723..a2e03058d33 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/suits/armor.dmi and b/modular_skyrat/master_files/icons/mob/clothing/suits/armor.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/security.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/security.dmi index e41aa8186ef..fa9c4889689 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/security.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/security.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/security_digi.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/security_digi.dmi index 2f10b968ed3..add8e585c4e 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/security_digi.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/security_digi.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/suits/armor.dmi b/modular_skyrat/master_files/icons/obj/clothing/suits/armor.dmi index 2e71ff03234..9b32189459f 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/suits/armor.dmi and b/modular_skyrat/master_files/icons/obj/clothing/suits/armor.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/suits/labcoat.dmi b/modular_skyrat/master_files/icons/obj/clothing/suits/labcoat.dmi index 67c42b7597f..8126f117ef1 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/suits/labcoat.dmi and b/modular_skyrat/master_files/icons/obj/clothing/suits/labcoat.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/under/security.dmi b/modular_skyrat/master_files/icons/obj/clothing/under/security.dmi index 8b4b49c23fe..eb335d34503 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/under/security.dmi and b/modular_skyrat/master_files/icons/obj/clothing/under/security.dmi differ diff --git a/modular_skyrat/modules/admin/code/sooc.dm b/modular_skyrat/modules/admin/code/sooc.dm index c1dbc5c98f7..9c60d2347db 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) + 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) 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 bb69c8b38b9..e62c81552d5 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 @@ -344,15 +344,6 @@ "Graduate Student", ) -/datum/job/security_medic - alt_titles = list( - "Security Medic", - "Field Medic", - "Security Corpsman", - "Brig Physician", - "Combat Medic", - ) - /datum/job/security_officer alt_titles = list( "Security Officer", diff --git a/modular_skyrat/modules/automapper/code/area_spawn_entries.dm b/modular_skyrat/modules/automapper/code/area_spawn_entries.dm index ef177501504..ac668554a23 100644 --- a/modular_skyrat/modules/automapper/code/area_spawn_entries.dm +++ b/modular_skyrat/modules/automapper/code/area_spawn_entries.dm @@ -16,10 +16,6 @@ desired_atom = /mob/living/simple_animal/pet/poppy // Structures -/datum/area_spawn/secmed_locker - target_areas = list(/area/station/security/medical, /area/station/security/lockers) - desired_atom = /obj/structure/closet/secure_closet/security_medic - /datum/area_spawn/blueshield_locker target_areas = list(/area/station/command/heads_quarters/captain, /area/station/command/bridge, /area/station/command/corporate_dock, /area/station/command/meeting_room, /area/station/command/gateway) desired_atom = /obj/structure/closet/secure_closet/blueshield @@ -68,10 +64,6 @@ mode = AREA_SPAWN_MODE_MOUNT_WALL // Job spawners -/datum/area_spawn/secmed_landmark - target_areas = list(/area/station/security/medical, /area/station/security/brig) - desired_atom = /obj/effect/landmark/start/security_medic - /datum/area_spawn/barber_landmark target_areas = list(/area/station/service/salon, /area/station/hallway/secondary/service) desired_atom = /obj/effect/landmark/start/barber diff --git a/modular_skyrat/modules/customization/modules/clothing/under/security.dm b/modular_skyrat/modules/customization/modules/clothing/under/security.dm index 487b960deb1..e2eb5526218 100644 --- a/modular_skyrat/modules/customization/modules/clothing/under/security.dm +++ b/modular_skyrat/modules/customization/modules/clothing/under/security.dm @@ -75,21 +75,7 @@ // End Police Uniforms -///SECMED -/obj/item/clothing/under/rank/medical/scrubs/skyrat/red/sec - name = "security medic scrubs" - desc = "It's made of a special fiber that provides minor protection against biohazards and acid, along with some light padding. This one is in a deep red." - armor_type = /datum/armor/red_sec - /// PRISONER - -/datum/armor/red_sec - melee = 10 - bio = 10 - fire = 30 - acid = 30 - wound = 10 - /obj/item/clothing/under/rank/prisoner/protcust name = "protective custody prisoner jumpsuit" desc = "A mustard coloured prison jumpsuit, often worn by former Security members, informants and former CentCom employees. Its suit sensors are stuck in the \"Fully On\" position." diff --git a/modular_skyrat/modules/customization/modules/jobs/_job.dm b/modular_skyrat/modules/customization/modules/jobs/_job.dm index bce13cad92a..af223cbc67c 100644 --- a/modular_skyrat/modules/customization/modules/jobs/_job.dm +++ b/modular_skyrat/modules/customization/modules/jobs/_job.dm @@ -60,9 +60,6 @@ /datum/job/warden banned_quirks = list(SEC_RESTRICTED_QUIRKS) -/datum/job/security_medic - banned_quirks = list(SEC_RESTRICTED_QUIRKS) - /datum/job/blueshield banned_quirks = list(SEC_RESTRICTED_QUIRKS) 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 cdd274346d7..51cb387f65f 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_WARDEN, JOB_DETECTIVE, JOB_SECURITY_MEDIC, JOB_CORRECTIONS_OFFICER) + restricted_roles = list(JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, 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_WARDEN, JOB_DETECTIVE, JOB_SECURITY_MEDIC, JOB_CORRECTIONS_OFFICER) + restricted_roles = list(JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_CORRECTIONS_OFFICER) /datum/loadout_item/suit/rax_aerostatic_jacket name = "Navy Aerostatic Jacket" diff --git a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_accessory.dm b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_accessory.dm index 88f0256650b..9140fc6ee7e 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_accessory.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_accessory.dm @@ -73,7 +73,7 @@ GLOBAL_LIST_INIT(loadout_accessory, generate_loadout_items(/datum/loadout_item/a /datum/loadout_item/accessory/armband_security name = "Security Armband" item_path = /obj/item/clothing/accessory/armband/deputy/lopland - restricted_roles = list(JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_MEDIC) + restricted_roles = list(JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE) /datum/loadout_item/accessory/armband_security_deputy name = "Security Deputy Armband" diff --git a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_glasses.dm b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_glasses.dm index c3f75708370..d848176ca50 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_glasses.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_glasses.dm @@ -146,7 +146,7 @@ GLOBAL_LIST_INIT(loadout_glasses, generate_loadout_items(/datum/loadout_item/gla /datum/loadout_item/glasses/medicpatch name = "Medical Eyepatch" item_path = /obj/item/clothing/glasses/hud/eyepatch/med - restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_VIROLOGIST, JOB_PARAMEDIC, JOB_SECURITY_MEDIC, JOB_ORDERLY, JOB_CORONER) + restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_VIROLOGIST, JOB_PARAMEDIC, JOB_ORDERLY, JOB_CORONER) /datum/loadout_item/glasses/robopatch name = "Diagnostic Eyepatch" @@ -181,7 +181,7 @@ GLOBAL_LIST_INIT(loadout_glasses, generate_loadout_items(/datum/loadout_item/gla /datum/loadout_item/glasses/medhud_glasses name = "Prescription Medical HUD" item_path = /obj/item/clothing/glasses/hud/health/prescription - restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_VIROLOGIST, JOB_PARAMEDIC, JOB_SECURITY_MEDIC, JOB_ORDERLY, JOB_CORONER) + restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_VIROLOGIST, JOB_PARAMEDIC, JOB_ORDERLY, JOB_CORONER) /datum/loadout_item/glasses/diaghud_glasses name = "Prescription Diagnostic HUD" @@ -201,7 +201,7 @@ GLOBAL_LIST_INIT(loadout_glasses, generate_loadout_items(/datum/loadout_item/gla /datum/loadout_item/glasses/aviator_health name = "Medical HUD Aviators" item_path = /obj/item/clothing/glasses/hud/ar/aviator/health - restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_VIROLOGIST, JOB_PARAMEDIC, JOB_SECURITY_MEDIC, JOB_ORDERLY, JOB_CORONER) + restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_VIROLOGIST, JOB_PARAMEDIC, JOB_ORDERLY, JOB_CORONER) /datum/loadout_item/glasses/aviator_meson name = "Meson HUD Aviators" @@ -227,7 +227,7 @@ GLOBAL_LIST_INIT(loadout_glasses, generate_loadout_items(/datum/loadout_item/gla /datum/loadout_item/glasses/prescription_aviator_health name = "Prescription Medical HUD Aviators" item_path = /obj/item/clothing/glasses/hud/ar/aviator/health/prescription - restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_VIROLOGIST, JOB_PARAMEDIC, JOB_SECURITY_MEDIC, JOB_ORDERLY, JOB_CORONER) + restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_VIROLOGIST, JOB_PARAMEDIC, JOB_ORDERLY, JOB_CORONER) /datum/loadout_item/glasses/prescription_aviator_meson name = "Prescription Meson HUD Aviators" @@ -252,7 +252,7 @@ GLOBAL_LIST_INIT(loadout_glasses, generate_loadout_items(/datum/loadout_item/gla /datum/loadout_item/glasses/retinal_projector_health name = "Retinal Projector Health HUD" item_path = /obj/item/clothing/glasses/hud/ar/projector/health - restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_VIROLOGIST, JOB_PARAMEDIC, JOB_SECURITY_MEDIC, JOB_ORDERLY, JOB_CORONER) + restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_VIROLOGIST, JOB_PARAMEDIC, JOB_ORDERLY, JOB_CORONER) /datum/loadout_item/glasses/retinal_projector_meson name = "Retinal Projector Meson HUD" diff --git a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_heads.dm b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_heads.dm index e91741e407d..87f46bdfbe4 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_heads.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_heads.dm @@ -415,27 +415,27 @@ GLOBAL_LIST_INIT(loadout_helmets, generate_loadout_items(/datum/loadout_item/hea /datum/loadout_item/head/trekcap name = "Officer's Cap (White)" item_path = /obj/item/clothing/head/hats/caphat/parade/fedcap - restricted_roles = list(JOB_CAPTAIN,JOB_HEAD_OF_PERSONNEL) + restricted_roles = list(JOB_CAPTAIN, JOB_HEAD_OF_PERSONNEL) /datum/loadout_item/head/trekcapcap name = "Officer's Cap (Black)" item_path = /obj/item/clothing/head/hats/caphat/parade/fedcap/black - restricted_roles = list(JOB_CAPTAIN,JOB_HEAD_OF_PERSONNEL,JOB_HEAD_OF_SECURITY) + restricted_roles = list(JOB_CAPTAIN, JOB_HEAD_OF_PERSONNEL, JOB_HEAD_OF_SECURITY) /datum/loadout_item/head/trekcapmedisci name = "MedSci Officer's Cap (Blue)" item_path = /obj/item/clothing/head/hats/caphat/parade/fedcap/medsci - restricted_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_SECURITY_MEDIC,JOB_PARAMEDIC,JOB_CHEMIST,JOB_VIROLOGIST,JOB_PSYCHOLOGIST,JOB_GENETICIST,JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST,JOB_ROBOTICIST,JOB_ORDERLY,JOB_CORONER) + restricted_roles = list(JOB_CHIEF_MEDICAL_OFFICER, JOB_MEDICAL_DOCTOR, JOB_PARAMEDIC, JOB_CHEMIST, JOB_VIROLOGIST, JOB_PSYCHOLOGIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_SCIENTIST, JOB_ROBOTICIST, JOB_ORDERLY, JOB_CORONER) /datum/loadout_item/head/trekcapeng name = "Eng Officer's Cap (Yellow)" item_path = /obj/item/clothing/head/hats/caphat/parade/fedcap/eng - restricted_roles = list(JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_STATION_ENGINEER,JOB_SECURITY_MEDIC,JOB_WARDEN,JOB_DETECTIVE,JOB_SECURITY_OFFICER,JOB_HEAD_OF_SECURITY,JOB_CORRECTIONS_OFFICER,JOB_CARGO_TECHNICIAN, JOB_SHAFT_MINER, JOB_QUARTERMASTER, JOB_ENGINEERING_GUARD, JOB_CUSTOMS_AGENT) + restricted_roles = list(JOB_CHIEF_ENGINEER, JOB_ATMOSPHERIC_TECHNICIAN, JOB_STATION_ENGINEER, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_CARGO_TECHNICIAN, JOB_SHAFT_MINER, JOB_QUARTERMASTER, JOB_ENGINEERING_GUARD, JOB_CUSTOMS_AGENT) /datum/loadout_item/head/trekcapsec name = "Officer's Cap (Red)" item_path = /obj/item/clothing/head/hats/caphat/parade/fedcap/sec - restricted_roles = list(JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_STATION_ENGINEER,JOB_SECURITY_MEDIC,JOB_WARDEN,JOB_DETECTIVE,JOB_SECURITY_OFFICER,JOB_HEAD_OF_SECURITY,JOB_CORRECTIONS_OFFICER,JOB_CARGO_TECHNICIAN, JOB_SHAFT_MINER, JOB_QUARTERMASTER, JOB_CUSTOMS_AGENT) + restricted_roles = list(JOB_CHIEF_ENGINEER, JOB_ATMOSPHERIC_TECHNICIAN, JOB_STATION_ENGINEER, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_CARGO_TECHNICIAN, JOB_SHAFT_MINER, JOB_QUARTERMASTER, JOB_CUSTOMS_AGENT) /* * JOB-LOCKED @@ -465,22 +465,22 @@ GLOBAL_LIST_INIT(loadout_helmets, generate_loadout_items(/datum/loadout_item/hea /datum/loadout_item/head/cowboyhat_sec name = "Cattleman Hat, Security" item_path = /obj/item/clothing/head/cowboy/skyrat/cattleman/sec - restricted_roles = list(JOB_WARDEN,JOB_DETECTIVE,JOB_SECURITY_MEDIC,JOB_SECURITY_OFFICER,JOB_HEAD_OF_SECURITY,JOB_CORRECTIONS_OFFICER) + restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER) /datum/loadout_item/head/cowboyhat_secwide name = "Wide-Brimmed Cattleman Hat, Security" item_path = /obj/item/clothing/head/cowboy/skyrat/cattleman/wide/sec - restricted_roles = list(JOB_WARDEN,JOB_DETECTIVE,JOB_SECURITY_MEDIC,JOB_SECURITY_OFFICER,JOB_HEAD_OF_SECURITY,JOB_CORRECTIONS_OFFICER) + restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER) /datum/loadout_item/head/ushanka/sec name = "Security Ushanka" item_path = /obj/item/clothing/head/costume/ushanka/sec - restricted_roles = list(JOB_WARDEN,JOB_DETECTIVE,JOB_SECURITY_MEDIC,JOB_SECURITY_OFFICER,JOB_HEAD_OF_SECURITY,JOB_CORRECTIONS_OFFICER) + restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER) /datum/loadout_item/head/blasthelmet name = "General's Helmet" item_path = /obj/item/clothing/head/hats/imperial/helmet - restricted_roles = list(JOB_WARDEN,JOB_DETECTIVE,JOB_SECURITY_MEDIC,JOB_SECURITY_OFFICER,JOB_CORRECTIONS_OFFICER,JOB_CAPTAIN, JOB_HEAD_OF_PERSONNEL, JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_QUARTERMASTER, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER) + restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_CORRECTIONS_OFFICER, JOB_CAPTAIN, JOB_HEAD_OF_PERSONNEL, JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_QUARTERMASTER, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER) /datum/loadout_item/head/navybluehoscap name = "Head of Security's Naval Cap" @@ -490,17 +490,17 @@ GLOBAL_LIST_INIT(loadout_helmets, generate_loadout_items(/datum/loadout_item/hea /datum/loadout_item/head/navyblueofficerberet name = "Security Officer's Navy Blue beret" item_path = /obj/item/clothing/head/beret/sec/navyofficer - restricted_roles = list(JOB_SECURITY_OFFICER, JOB_SECURITY_MEDIC, JOB_HEAD_OF_SECURITY, JOB_WARDEN) + restricted_roles = list(JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_WARDEN) /datum/loadout_item/head/solofficercap name = "Security Officer's Sol Cap" item_path = /obj/item/clothing/head/hats/sec/peacekeeper/sol - restricted_roles = list(JOB_SECURITY_OFFICER, JOB_SECURITY_MEDIC, JOB_HEAD_OF_SECURITY, JOB_WARDEN) + restricted_roles = list(JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_WARDEN) /datum/loadout_item/head/soltrafficoff name = "Traffic Officer Cap" item_path = /obj/item/clothing/head/hats/sec/peacekeeper/sol/traffic - restricted_roles = list(JOB_SECURITY_OFFICER, JOB_SECURITY_MEDIC, JOB_HEAD_OF_SECURITY, JOB_WARDEN) + restricted_roles = list(JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_WARDEN) /datum/loadout_item/head/navybluewardenberet name = "Warden's Navy Blue beret" @@ -515,7 +515,7 @@ GLOBAL_LIST_INIT(loadout_helmets, generate_loadout_items(/datum/loadout_item/hea /datum/loadout_item/head/nursehat name = "Nurse Hat" item_path = /obj/item/clothing/head/costume/nursehat - restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_VIROLOGIST,JOB_SECURITY_MEDIC) + restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_VIROLOGIST) /datum/loadout_item/head/imperial_generic name = "Grey Naval Officer Cap" @@ -562,7 +562,7 @@ GLOBAL_LIST_INIT(loadout_helmets, generate_loadout_items(/datum/loadout_item/hea /datum/loadout_item/head/beret_med name = "Medical Beret" item_path = /obj/item/clothing/head/beret/medical - restricted_roles = list(JOB_MEDICAL_DOCTOR,JOB_VIROLOGIST, JOB_CHEMIST, JOB_CHIEF_MEDICAL_OFFICER, JOB_SECURITY_MEDIC, JOB_ORDERLY, JOB_CORONER) + restricted_roles = list(JOB_MEDICAL_DOCTOR,JOB_VIROLOGIST, JOB_CHEMIST, JOB_CHIEF_MEDICAL_OFFICER, JOB_ORDERLY, JOB_CORONER) /datum/loadout_item/head/beret_paramedic name = "Paramedic Beret" diff --git a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_neck.dm b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_neck.dm index d33f9393ea1..8b9b580ac9a 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_neck.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_neck.dm @@ -12,7 +12,7 @@ GLOBAL_LIST_INIT(loadout_necks, generate_loadout_items(/datum/loadout_item/neck) if(initial(outfit_important_for_life.neck)) .. () return TRUE - + /datum/loadout_item/neck/insert_path_into_outfit(datum/outfit/outfit, mob/living/carbon/human/equipper, visuals_only = FALSE, override_items = LOADOUT_OVERRIDE_BACKPACK) if(override_items == LOADOUT_OVERRIDE_BACKPACK) if(outfit.neck) @@ -251,7 +251,7 @@ GLOBAL_LIST_INIT(loadout_necks, generate_loadout_items(/datum/loadout_item/neck) /datum/loadout_item/neck/stethoscope name = "Stethoscope" item_path = /obj/item/clothing/neck/stethoscope - restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER,JOB_SECURITY_MEDIC) + restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER) /datum/loadout_item/neck/maid name = "Maid Neck Cover" diff --git a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm index 961ec988d50..c4ee9f79e5c 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm @@ -562,7 +562,7 @@ GLOBAL_LIST_INIT(loadout_exosuits, generate_loadout_items(/datum/loadout_item/su /datum/loadout_item/suit/navybluejacketofficer name = "Security Officer's Navy Blue Formal Jacket" item_path = /obj/item/clothing/suit/jacket/officer/blue - restricted_roles = list(JOB_SECURITY_OFFICER,JOB_SECURITY_MEDIC ,JOB_HEAD_OF_SECURITY, JOB_WARDEN) // I aint making a medic one, maybe i'll add some rank thing from cm or civ for it + restricted_roles = list(JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_WARDEN) // I aint making a medic one, maybe i'll add some rank thing from cm or civ for it /datum/loadout_item/suit/navybluejacketwarden name = "Warden's Navy Blue Formal Jacket" @@ -577,12 +577,12 @@ GLOBAL_LIST_INIT(loadout_exosuits, generate_loadout_items(/datum/loadout_item/su /datum/loadout_item/suit/security_jacket name = "Security Jacket" item_path = /obj/item/clothing/suit/toggle/jacket/sec - restricted_roles = list(JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_MEDIC) //Not giving this one to COs because it's actually better than the one they spawn with + restricted_roles = list(JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE) //Not giving this one to COs because it's actually better than the one they spawn with /datum/loadout_item/suit/brit name = "High Vis Armored Vest" item_path = /obj/item/clothing/suit/armor/vest/peacekeeper/brit - restricted_roles = list(JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_MEDIC, JOB_CORRECTIONS_OFFICER) + restricted_roles = list(JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_CORRECTIONS_OFFICER) /datum/loadout_item/suit/british_jacket name = "Peacekeeper Officer Coat" @@ -622,7 +622,7 @@ GLOBAL_LIST_INIT(loadout_exosuits, generate_loadout_items(/datum/loadout_item/su /datum/loadout_item/suit/labcoat_highvis name = "High-Vis Labcoat" item_path = /obj/item/clothing/suit/toggle/labcoat/skyrat/highvis - restricted_roles = list(JOB_CHIEF_MEDICAL_OFFICER, JOB_PARAMEDIC, JOB_ATMOSPHERIC_TECHNICIAN, JOB_DETECTIVE, JOB_SECURITY_MEDIC, JOB_CHEMIST, JOB_ORDERLY) // And now chemist and orderly get it too. + restricted_roles = list(JOB_CHIEF_MEDICAL_OFFICER, JOB_PARAMEDIC, JOB_ATMOSPHERIC_TECHNICIAN, JOB_DETECTIVE, JOB_CHEMIST, JOB_ORDERLY) // And now chemist and orderly get it too. /* * FAMILIES diff --git a/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm b/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm index b6a1a8b7fb9..125caf12e78 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm @@ -118,12 +118,12 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ /datum/loadout_item/under/jumpsuit/security_trousers name = "Security Trousers" item_path = /obj/item/clothing/under/rank/security/peacekeeper/trousers - restricted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY, JOB_SECURITY_MEDIC) + restricted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY) /datum/loadout_item/under/jumpsuit/solofficer name = "Sol Officer Uniform" item_path = /obj/item/clothing/under/rank/security/peacekeeper/sol - restricted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY, JOB_SECURITY_MEDIC) + restricted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY) /datum/loadout_item/under/jumpsuit/disco name = "Superstar Cop Uniform" @@ -182,7 +182,7 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ /datum/loadout_item/under/jumpsuit/utility_med name = "Medical Utility Uniform" item_path = /obj/item/clothing/under/rank/medical/doctor/skyrat/utility - restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_PARAMEDIC, JOB_CHEMIST, JOB_VIROLOGIST, JOB_GENETICIST, JOB_SECURITY_MEDIC, JOB_CHIEF_MEDICAL_OFFICER, JOB_PSYCHOLOGIST, JOB_ORDERLY) + restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_PARAMEDIC, JOB_CHEMIST, JOB_VIROLOGIST, JOB_GENETICIST, JOB_CHIEF_MEDICAL_OFFICER, JOB_PSYCHOLOGIST, JOB_ORDERLY) /datum/loadout_item/under/jumpsuit/utility_sci name = "Science Utility Uniform" @@ -197,7 +197,7 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ /datum/loadout_item/under/jumpsuit/utility_sec name = "Security Utility Uniform" item_path = /obj/item/clothing/under/rank/security/skyrat/utility - restricted_roles = list(JOB_SECURITY_OFFICER, JOB_DETECTIVE, JOB_WARDEN, JOB_BLUESHIELD, JOB_SECURITY_MEDIC, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER) //i dunno about the blueshield, they're a weird combo of sec and command, thats why they arent in the loadout pr im making + restricted_roles = list(JOB_SECURITY_OFFICER, JOB_DETECTIVE, JOB_WARDEN, JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER) //i dunno about the blueshield, they're a weird combo of sec and command, thats why they arent in the loadout pr im making /datum/loadout_item/under/jumpsuit/utility_com name = "Command Utility Uniform" @@ -511,35 +511,30 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ item_path = /obj/item/clothing/under/rank/prisoner/classic restricted_roles = list(JOB_PRISONER) -/datum/loadout_item/under/miscellaneous/medrscrubs - name = "Security Medic's Scrubs" - item_path = /obj/item/clothing/under/rank/medical/scrubs/skyrat/red/sec - restricted_roles = list(JOB_SECURITY_MEDIC) - /datum/loadout_item/under/miscellaneous/redscrubs name = "Red Scrubs" item_path = /obj/item/clothing/under/rank/medical/scrubs/skyrat/red - restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_VIROLOGIST, JOB_SECURITY_MEDIC, JOB_PARAMEDIC) + restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_VIROLOGIST, JOB_PARAMEDIC) /datum/loadout_item/under/miscellaneous/bluescrubs name = "Blue Scrubs" item_path = /obj/item/clothing/under/rank/medical/scrubs/blue - restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_VIROLOGIST, JOB_SECURITY_MEDIC, JOB_PARAMEDIC) + restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_VIROLOGIST, JOB_PARAMEDIC) /datum/loadout_item/under/miscellaneous/greenscrubs name = "Green Scrubs" item_path = /obj/item/clothing/under/rank/medical/scrubs/green - restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_VIROLOGIST, JOB_SECURITY_MEDIC, JOB_PARAMEDIC) + restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_VIROLOGIST, JOB_PARAMEDIC) /datum/loadout_item/under/miscellaneous/purplescrubs name = "Purple Scrubs" item_path = /obj/item/clothing/under/rank/medical/scrubs/purple - restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_VIROLOGIST, JOB_SECURITY_MEDIC, JOB_PARAMEDIC) + restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_VIROLOGIST, JOB_PARAMEDIC) /datum/loadout_item/under/miscellaneous/whitescrubs name = "White Scrubs" item_path = /obj/item/clothing/under/rank/medical/scrubs/skyrat/white - restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_VIROLOGIST, JOB_SECURITY_MEDIC, JOB_PARAMEDIC) + restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_VIROLOGIST, JOB_PARAMEDIC) /datum/loadout_item/under/miscellaneous/gear_harness name = "Gear Harness" diff --git a/modular_skyrat/modules/oneclickantag/code/oneclickantag.dm b/modular_skyrat/modules/oneclickantag/code/oneclickantag.dm index 9612651a429..e971d291ace 100644 --- a/modular_skyrat/modules/oneclickantag/code/oneclickantag.dm +++ b/modular_skyrat/modules/oneclickantag/code/oneclickantag.dm @@ -82,7 +82,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_SECURITY_MEDIC, 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_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 bb4a812d521..37088b923d0 100644 --- a/modular_skyrat/modules/protected_roles/code/antag_restricted_jobs.dm +++ b/modular_skyrat/modules/protected_roles/code/antag_restricted_jobs.dm @@ -27,9 +27,6 @@ /datum/job/blueshield antagonist_restricted = TRUE -/datum/job/security_medic - antagonist_restricted = TRUE - /datum/job/corrections_officer antagonist_restricted = TRUE diff --git a/modular_skyrat/modules/sec_haul/code/guns/gunsets.dm b/modular_skyrat/modules/sec_haul/code/guns/gunsets.dm index 9f6a7c16ffa..f67d2ac2271 100644 --- a/modular_skyrat/modules/sec_haul/code/guns/gunsets.dm +++ b/modular_skyrat/modules/sec_haul/code/guns/gunsets.dm @@ -404,7 +404,7 @@ new /obj/item/ammo_box/magazine/multi_sprite/g11(src) /* -* SEC MEDIC +* OLD SECMED SIDEARM */ /obj/item/storage/box/gunset/firefly diff --git a/modular_skyrat/modules/sec_haul/code/security_medic/secmed_clothes.dm b/modular_skyrat/modules/sec_haul/code/security_medic/secmed_clothes.dm deleted file mode 100644 index a8f614a4bd4..00000000000 --- a/modular_skyrat/modules/sec_haul/code/security_medic/secmed_clothes.dm +++ /dev/null @@ -1,126 +0,0 @@ -/obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic - name = "security medic labcoat" - icon_state = "secmed_labcoat" //Icon located in modular_skyrat/master_files/icons/(obj or mob)/clothing/suits/labcoat.dmi - blood_overlay_type = "armor" - supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON - armor_type = /datum/armor/skyrat_security_medic - -/datum/armor/skyrat_security_medic - melee = 35 - bullet = 30 - laser = 30 - energy = 40 - bomb = 25 - fire = 50 - acid = 50 - wound = 10 - -/obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic/Initialize(mapload) - . = ..() - allowed += list( - /obj/item/flashlight, - /obj/item/gun, - /obj/item/melee/baton/telescopic, - /obj/item/storage/medkit - ) - -/obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic/blue - icon_state = "secmed_labcoat_blue" - -/obj/item/clothing/suit/hazardvest/security_medic - name = "security medic vest" - desc = "A lightweight vest worn by the Security Medic." - icon = 'modular_skyrat/master_files/icons/obj/clothing/suits/armor.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suits/armor.dmi' - icon_state = "secmed_vest" - worn_icon_state = "secmed_vest" - supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON - allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight, /obj/item/reagent_containers/cup/bottle, /obj/item/reagent_containers/cup/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/baton/telescopic, /obj/item/soap, /obj/item/tank/internals/emergency_oxygen, /obj/item/gun, /obj/item/storage/medkit) - armor_type = /datum/armor/hazardvest_security_medic - -/datum/armor/hazardvest_security_medic - melee = 35 - bullet = 30 - laser = 30 - energy = 40 - bomb = 25 - fire = 50 - acid = 50 - wound = 10 - -/obj/item/clothing/suit/hazardvest/security_medic/blue - icon_state = "secmed_vest_blue" - worn_icon_state = "secmed_vest_blue" - -/obj/item/clothing/suit/armor/vest/peacekeeper/security_medic - name = "security medic armor vest" - desc = "A security medic's armor vest, with little pockets for little things." - icon = 'modular_skyrat/master_files/icons/obj/clothing/suits/armor.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suits/armor.dmi' - icon_state = "secmed_armor" - worn_icon_state = "secmed_armor" - supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON - allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight, /obj/item/reagent_containers/cup/bottle, /obj/item/reagent_containers/cup/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/baton/telescopic, /obj/item/soap, /obj/item/tank/internals/emergency_oxygen, /obj/item/gun, /obj/item/storage/medkit) - -/obj/item/clothing/under/rank/security/peacekeeper/security_medic/alternate - name = "security medic uniform" - desc = "A lightly armored uniform worn by Nanotrasen's Asset Protection Medical Corps." - icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi' - worn_icon_digi = 'modular_skyrat/master_files/icons/mob/clothing/uniform_digi.dmi' - icon_state = "security_medic_jumpsuit" - -/obj/item/clothing/under/rank/security/peacekeeper/security_medic - name = "security medic turtleneck" - desc = "A comfy turtleneck with a white armband, denoting the wearer as a security medic." - icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi' - icon_state = "security_medic_turtleneck" - supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION - -/obj/item/clothing/under/rank/security/peacekeeper/security_medic/skirt - name = "security medic skirtleneck" - desc = "A comfy turtleneck with a white armband and brown skirt, denoting the wearer as a security medic." - icon_state = "security_medic_turtleneck_skirt" - body_parts_covered = CHEST|GROIN|ARMS - female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY - supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON - -/obj/item/clothing/head/beret/sec/peacekeeper/security_medic - name = "security medic beret" - desc = "A robust beret with the medical insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection." - greyscale_colors = "#3F3C40#870E12" - icon_state = "beret_badge_med" - supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON - -/obj/item/clothing/head/helmet/sec/peacekeeper/security_medic - name = "security medic helmet" - desc = "A standard issue combat helmet for security medics. Has decent tensile strength and armor. Keep your head down." - icon = 'modular_skyrat/master_files/icons/obj/clothing/head/helmet.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head/helmet.dmi' - icon_state = "secmed_helmet" - base_icon_state = "secmed_helmet" - can_toggle = FALSE - actions_types = null - supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON - -/obj/item/storage/belt/security/medic - name = "security medic belt" - desc = "A fancy looking security belt emblazoned with markings of the security medic. Sadly only holds security gear." - icon = 'modular_skyrat/master_files/icons/obj/clothing/belts.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/belt.dmi' - worn_icon_state = "belt_medic" - icon_state = "belt_medic" - -/obj/item/storage/belt/security/medic/full/PopulateContents() - new /obj/item/reagent_containers/spray/pepper(src) - new /obj/item/restraints/handcuffs(src) - new /obj/item/grenade/flashbang(src) - new /obj/item/assembly/flash/handheld(src) - new /obj/item/melee/baton/security/loaded(src) - update_appearance() - -/obj/item/storage/belt/security/medic/alternate - name = "security medic belt" - worn_icon_state = "belt_medic_alt" - icon_state = "belt_medic_alt" diff --git a/modular_skyrat/modules/sec_haul/code/security_medic/security_medic.dm b/modular_skyrat/modules/sec_haul/code/security_medic/security_medic.dm deleted file mode 100644 index efca4b31eb8..00000000000 --- a/modular_skyrat/modules/sec_haul/code/security_medic/security_medic.dm +++ /dev/null @@ -1,116 +0,0 @@ -/datum/job/security_medic - title = JOB_SECURITY_MEDIC - description = "Patch up officers and prisoners, realize you don't have the tools to Tend Wounds, barge into Medbay and tell them how to do their jobs" - auto_deadmin_role_flags = DEADMIN_POSITION_SECURITY - department_head = list(JOB_HEAD_OF_SECURITY) - faction = FACTION_STATION - total_positions = 1 - spawn_positions = 1 - supervisors = SUPERVISOR_HOS - minimal_player_age = 7 - exp_requirements = 120 - exp_required_type = EXP_TYPE_CREW - exp_required_type_department = EXP_TYPE_SECURITY - exp_granted_type = EXP_TYPE_CREW - config_tag = "SECURITY_MEDIC" - - outfit = /datum/outfit/job/security_medic - plasmaman_outfit = /datum/outfit/plasmaman/security - - paycheck = PAYCHECK_CREW - paycheck_department = ACCOUNT_SEC - - liver_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) - - display_order = JOB_DISPLAY_ORDER_SECURITY_MEDIC - bounty_types = CIV_JOB_SEC - departments_list = list( - /datum/job_department/security, - /datum/job_department/medical, - ) - - family_heirlooms = list(/obj/item/clothing/neck/stethoscope, /obj/item/book/manual/wiki/security_space_law) - - //This is the paramedic goodie list. Secmedics are paramedics more or less so they can use these instead of raiding medbay. - mail_goodies = list( - /obj/item/reagent_containers/hypospray/medipen = 20, - /obj/item/reagent_containers/hypospray/medipen/oxandrolone = 10, - /obj/item/reagent_containers/hypospray/medipen/salacid = 10, - /obj/item/reagent_containers/hypospray/medipen/salbutamol = 10, - /obj/item/reagent_containers/hypospray/medipen/penacid = 10, - /obj/item/reagent_containers/hypospray/medipen/survival/luxury = 5 - ) - rpg_title = "Battle Cleric" - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN - -/datum/outfit/job/security_medic - name = "Security Medic" - jobtype = /datum/job/security_medic - - belt = /obj/item/modular_computer/pda/security - ears = /obj/item/radio/headset/headset_medsec - uniform = /obj/item/clothing/under/rank/security/peacekeeper/security_medic - gloves = /obj/item/clothing/gloves/latex/nitrile - shoes = /obj/item/clothing/shoes/jackboots/sec - glasses = /obj/item/clothing/glasses/hud/health/sunglasses - suit = /obj/item/clothing/suit/armor/vest/peacekeeper/security_medic - l_hand = /obj/item/storage/medkit/brute - head = /obj/item/clothing/head/beret/sec/peacekeeper/security_medic - backpack_contents = list( - /obj/item/storage/box/gunset/firefly = 1, - ) - backpack = /obj/item/storage/backpack/security - satchel = /obj/item/storage/backpack/satchel/sec - duffelbag = /obj/item/storage/backpack/duffelbag/sec - - box = /obj/item/storage/box/survival/security - - implants = list(/obj/item/implant/mindshield) - - id_trim = /datum/id_trim/job/security_medic - -/obj/effect/landmark/start/security_officer/Initialize(mapload) - . = ..() - new /obj/effect/landmark/start/security_medic(get_turf(src)) - -/obj/effect/landmark/start/security_medic - name = "Security Medic" - icon_state = "Security Medic" - icon = 'modular_skyrat/master_files/icons/mob/landmarks.dmi' - -/obj/item/encryptionkey/headset_medsec - name = "medical-security encryption key" - icon_state = "sec_cypherkey" - channels = list(RADIO_CHANNEL_MEDICAL = 1, RADIO_CHANNEL_SECURITY = 1) - -/obj/item/radio/headset/headset_medsec - name = "medical-security radio headset" - desc = "Used to hear how many security officers need to be stiched back together." - icon_state = "sec_headset" - keyslot = new /obj/item/encryptionkey/headset_medsec - -/obj/structure/closet/secure_closet/security_medic - name = "security medics's locker" - req_access = list(ACCESS_SECURITY) - icon = 'modular_skyrat/modules/sec_haul/icons/lockers/closet.dmi' - icon_state = "secmed" - - - -/obj/structure/closet/secure_closet/security_medic/PopulateContents() - ..() - new /obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic(src) - new /obj/item/clothing/suit/hazardvest/security_medic(src) - new /obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic/blue(src) - new /obj/item/clothing/suit/hazardvest/security_medic/blue(src) - new /obj/item/clothing/head/helmet/sec/peacekeeper/security_medic(src) - new /obj/item/clothing/under/rank/security/peacekeeper/tactical(src) - new /obj/item/radio/headset/headset_medsec(src) - new /obj/item/storage/medkit/emergency(src) - new /obj/item/clothing/suit/jacket/straight_jacket(src) - new /obj/item/storage/belt/medical(src) - new /obj/item/storage/belt/security/medic/full(src) - new /obj/item/clothing/under/rank/medical/scrubs/skyrat/red/sec(src) - new /obj/item/clothing/under/rank/security/peacekeeper/security_medic/alternate(src) - new /obj/item/clothing/under/rank/security/peacekeeper/security_medic(src) - new /obj/item/clothing/under/rank/security/peacekeeper/security_medic/skirt(src) diff --git a/tgstation.dme b/tgstation.dme index 3ff866f1483..1da1fb486b2 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6943,8 +6943,6 @@ #include "modular_skyrat\modules\sec_haul\code\peacekeeper\peacekeeper_clothing.dm" #include "modular_skyrat\modules\sec_haul\code\peacekeeper\peacekeeper_hammer.dm" #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\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"