diff --git a/code/__defines/jobs.dm b/code/__defines/jobs.dm index 2718859694..11a47ec735 100644 --- a/code/__defines/jobs.dm +++ b/code/__defines/jobs.dm @@ -326,6 +326,16 @@ #define JOB_ALT_SECURITY_DEPUTY "Security Deputy" #define JOB_ALT_JUNIOR_OFFICER "Junior Officer" #define JOB_ALT_SECURITY_CONTRACTOR "Security Contractor" + +// CHOMPAdd +#define JOB_BRIG_PHYSICIAN "Brig Physician" + // Brig Physician alt titles + #define JOB_ALT_SECURITY_MEDIC "Security Medic" + #define JOB_ALT_SECURITY_MEDIC_CARE "Security Medic Care Unit" + #define JOB_ALT_SECURITY_PENITENTIARY_MED "Penitentiary Medical Care Unit" + #define JOB_ALT_JUNIOR_BRIGPHYS "Junior Brig Physician" + #define JOB_ALT_DETENTION_HEALTH_OFFICER "Detention Health Officer" +// CHOMPAdd End //___________________________________________________________ diff --git a/code/datums/outfits/jobs/medical.dm b/code/datums/outfits/jobs/medical.dm index 1a05d246bd..1fd61dcef6 100644 --- a/code/datums/outfits/jobs/medical.dm +++ b/code/datums/outfits/jobs/medical.dm @@ -71,6 +71,7 @@ /decl/hierarchy/outfit/job/medical/geneticist name = OUTFIT_JOB_NAME(JOB_GENETICIST) + l_ear = /obj/item/device/radio/headset/headset_medsci // CHOMPAdd - Geneticists get their cool headset uniform = /obj/item/clothing/under/rank/geneticist suit = /obj/item/clothing/suit/storage/toggle/labcoat/genetics backpack = /obj/item/weapon/storage/backpack/genetics diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index bd2de262a4..ecd5bd579d 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -33,6 +33,7 @@ var/const/EXPLORER =(1<<12) var/const/SAR =(1<<13) var/const/XENOBOTANIST =(1<<14) var/const/PILOT =(1<<15) //ChompEDIT - ours is with the other explo jobs. +var/const/BRIGPHYS =(1<<16) // CHOMPAdd - Brig Physician var/const/CIVILIAN =(1<<2) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index c2998e78af..380c140bf2 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -162,7 +162,7 @@ /obj/item/device/radio/headset/headset_medsci name = "medical research radio headset" - desc = "A headset that is a result of the mating between medical and science." + desc = "A headset with combined medical and science functionality." // CHOMPEdit - Less mating icon_state = "med_headset" ks2type = /obj/item/device/encryptionkey/headset_medsci diff --git a/code/game/objects/items/weapons/id cards/CH_ids.dm b/code/game/objects/items/weapons/id cards/CH_ids.dm index a5aa0de5a0..0cec099848 100644 --- a/code/game/objects/items/weapons/id cards/CH_ids.dm +++ b/code/game/objects/items/weapons/id cards/CH_ids.dm @@ -35,4 +35,8 @@ name = "casino manager id" desc = "An ID card for the manager of the golden goose casino, fancy!" icon_state = "ch_casino_manager" - access = list(160, 200, 201, 202, 203, 300) \ No newline at end of file + access = list(160, 200, 201, 202, 203, 300) + +/obj/item/weapon/card/id/security/brigphysician + name = JOB_BRIG_PHYSICIAN + "'s ID" + initial_sprite_stack = list("base-stamp", "top-red", "stamp-n", "pips-medblu", "stripe-white") diff --git a/modular_chomp/code/datums/outfits/jobs/security.dm b/modular_chomp/code/datums/outfits/jobs/security.dm new file mode 100644 index 0000000000..4b2fbceba0 --- /dev/null +++ b/modular_chomp/code/datums/outfits/jobs/security.dm @@ -0,0 +1,16 @@ +/decl/hierarchy/outfit/job/security/brigphysician + name = OUTFIT_JOB_NAME(JOB_BRIG_PHYSICIAN) + uniform = /obj/item/clothing/under/rank/brigphys + l_ear = /obj/item/device/radio/headset/headset_medsec + id_type = /obj/item/weapon/card/id/security/brigphysician + pda_type = /obj/item/device/pda/medical + shoes = /obj/item/clothing/shoes/white + suit = /obj/item/clothing/suit/storage/toggle/labcoat + glasses = /obj/item/clothing/glasses/sunglasses/medhud + l_hand = /obj/item/weapon/storage/firstaid/adv + r_pocket = /obj/item/device/flashlight/pen + backpack = /obj/item/weapon/storage/backpack/medic + backpack_contents = null + messenger_bag = /obj/item/weapon/storage/backpack/messenger/med + sports_bag = /obj/item/weapon/storage/backpack/sport/white + gloves = /obj/item/clothing/gloves/sterile/nitrile diff --git a/modular_chomp/code/game/jobs/job/security.dm b/modular_chomp/code/game/jobs/job/security.dm new file mode 100644 index 0000000000..58208d8f8b --- /dev/null +++ b/modular_chomp/code/game/jobs/job/security.dm @@ -0,0 +1,39 @@ +/datum/job/brigphysician + title = JOB_BRIG_PHYSICIAN + flag = BRIGPHYS + departments = list(DEPARTMENT_SECURITY, DEPARTMENT_MEDICAL) + department_flag = ENGSEC + faction = "Station" + total_positions = 2 + spawn_positions = 2 + supervisors = "the " + JOB_HEAD_OF_SECURITY + " and " + JOB_CHIEF_MEDICAL_OFFICER + selection_color = "#601C1C" + economic_modifier = 7 + access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_security, access_sec_doors, access_brig, access_eva) + minimal_access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_virology, access_security, access_sec_doors, access_brig, access_eva) + + outfit_type = /decl/hierarchy/outfit/job/security/brigphysician + job_description = "The " + JOB_BRIG_PHYSICIAN + " is a doctor that helps security staff with medical issues. They have minimum access to Security, but they are not officers and should not conduct arrests." + alt_titles = list( + JOB_ALT_SECURITY_MEDIC = /datum/alt_title/security_medic, + JOB_ALT_SECURITY_MEDIC_CARE = /datum/alt_title/sec_med_supp, + JOB_ALT_SECURITY_PENITENTIARY_MED = /datum/alt_title/pen_med, + JOB_ALT_JUNIOR_BRIGPHYS = /datum/alt_title/junior_brigphys, + JOB_ALT_DETENTION_HEALTH_OFFICER = /datum/alt_title/detention_med + ) + outfit_type = /decl/hierarchy/outfit/job/security/brigphysician + +/datum/alt_title/security_medic + title = JOB_ALT_SECURITY_MEDIC + +/datum/alt_title/sec_med_supp + title = JOB_ALT_SECURITY_MEDIC_CARE + +/datum/alt_title/pen_med + title = JOB_ALT_SECURITY_PENITENTIARY_MED + +/datum/alt_title/junior_brigphys + title = JOB_ALT_JUNIOR_BRIGPHYS + +/datum/alt_title/detention_med + title = JOB_ALT_DETENTION_HEALTH_OFFICER diff --git a/modular_chomp/code/game/objects/items/devices/radio/encryptionkey.dm b/modular_chomp/code/game/objects/items/devices/radio/encryptionkey.dm new file mode 100644 index 0000000000..acc57f442c --- /dev/null +++ b/modular_chomp/code/game/objects/items/devices/radio/encryptionkey.dm @@ -0,0 +1,4 @@ +/obj/item/device/encryptionkey/headset_medsec + name = "medical security radio encryption key" + icon_state = "med_cypherkey" + channels = list(CHANNEL_MEDICAL = 1, CHANNEL_SECURITY = 1) diff --git a/modular_chomp/code/game/objects/items/devices/radio/headset.dm b/modular_chomp/code/game/objects/items/devices/radio/headset.dm index 001cd02bde..2ab52dedbe 100644 --- a/modular_chomp/code/game/objects/items/devices/radio/headset.dm +++ b/modular_chomp/code/game/objects/items/devices/radio/headset.dm @@ -92,4 +92,10 @@ name = "outsider radio encryption key" icon_state = "sec_cypherkey" - channels = list("Outsider" = 1) + channels = list(CHANNEL_OUTSIDER = 1) + +/obj/item/device/radio/headset/headset_medsec + name = "medical security radio headset" + desc = "A headset with combined medical and security functionality." + icon_state = "med_headset" + ks2type = /obj/item/device/encryptionkey/headset_medsec diff --git a/modular_chomp/code/modules/clothing/under/jobs/medsec.dm b/modular_chomp/code/modules/clothing/under/jobs/medsec.dm new file mode 100644 index 0000000000..ea788526a9 --- /dev/null +++ b/modular_chomp/code/modules/clothing/under/jobs/medsec.dm @@ -0,0 +1,15 @@ +/obj/item/clothing/under/rank/brigphys + icon = 'modular_chomp/icons/inventory/uniform/item.dmi' + icon_state = "brigphys" + icon_override = 'modular_chomp/icons/inventory/uniform/mob.dmi' + item_icons = list(slot_w_uniform_str = 'modular_chomp/icons/inventory/uniform/item.dmi', slot_r_hand_str = "red", slot_l_hand_str = "red") + desc = "It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel." + name = "brig physician's jumpsuit" + item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white") + permeability_coefficient = 0.50 + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) + rolled_sleeves = 0 + update_icon_define_digi = 'modular_chomp/icons/inventory/uniform/mob_digi.dmi' + +/obj/item/clothing/under/rank/brigphys/jeans + icon_state = "brigphysj" diff --git a/modular_chomp/icons/inventory/uniform/item.dmi b/modular_chomp/icons/inventory/uniform/item.dmi new file mode 100644 index 0000000000..d2b0a93c73 Binary files /dev/null and b/modular_chomp/icons/inventory/uniform/item.dmi differ diff --git a/modular_chomp/icons/inventory/uniform/mob.dmi b/modular_chomp/icons/inventory/uniform/mob.dmi new file mode 100644 index 0000000000..2df90890a5 Binary files /dev/null and b/modular_chomp/icons/inventory/uniform/mob.dmi differ diff --git a/modular_chomp/icons/inventory/uniform/mob_digi.dmi b/modular_chomp/icons/inventory/uniform/mob_digi.dmi new file mode 100644 index 0000000000..628c427eee Binary files /dev/null and b/modular_chomp/icons/inventory/uniform/mob_digi.dmi differ diff --git a/vorestation.dme b/vorestation.dme index bb7a65f959..7af1c84295 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -4728,6 +4728,7 @@ #include "modular_chomp\code\datums\outfits\jobs\cargo.dm" #include "modular_chomp\code\datums\outfits\jobs\command.dm" #include "modular_chomp\code\datums\outfits\jobs\noncrew.dm" +#include "modular_chomp\code\datums\outfits\jobs\security.dm" #include "modular_chomp\code\datums\supplypacks\contraband.dm" #include "modular_chomp\code\datums\supplypacks\medical.dm" #include "modular_chomp\code\datums\supplypacks\misc.dm" @@ -4742,6 +4743,7 @@ #include "modular_chomp\code\game\jobs\job\job_goodies.dm" #include "modular_chomp\code\game\jobs\job\job_whitelist_overrides.dm" #include "modular_chomp\code\game\jobs\job\noncrew.dm" +#include "modular_chomp\code\game\jobs\job\security.dm" #include "modular_chomp\code\game\jobs\job\silicon.dm" #include "modular_chomp\code\game\machinery\airconditioner_ch.dm" #include "modular_chomp\code\game\machinery\autolathe_armory.dm" @@ -4768,6 +4770,7 @@ #include "modular_chomp\code\game\objects\items\devices\flipper.dm" #include "modular_chomp\code\game\objects\items\devices\mind_binder.dm" #include "modular_chomp\code\game\objects\items\devices\vacpack.dm" +#include "modular_chomp\code\game\objects\items\devices\radio\encryptionkey.dm" #include "modular_chomp\code\game\objects\items\devices\radio\headset.dm" #include "modular_chomp\code\game\objects\items\weapons\capture_crystal.dm" #include "modular_chomp\code\game\objects\items\weapons\cigs_lighters.dm" @@ -4846,6 +4849,7 @@ #include "modular_chomp\code\modules\clothing\suits\jobs.dm" #include "modular_chomp\code\modules\clothing\under\accessories\holster.dm" #include "modular_chomp\code\modules\clothing\under\jobs\civilian.dm" +#include "modular_chomp\code\modules\clothing\under\jobs\medsec.dm" #include "modular_chomp\code\modules\datums\supplypacks\contraband.dm" #include "modular_chomp\code\modules\datums\supplypacks\engineering.dm" #include "modular_chomp\code\modules\datums\supplypacks\hydrophonic.dm"