diff --git a/code/datums/outfits/jobs/civilian.dm b/code/datums/outfits/jobs/civilian.dm index 6be14869b72..bbd96990fb8 100644 --- a/code/datums/outfits/jobs/civilian.dm +++ b/code/datums/outfits/jobs/civilian.dm @@ -21,11 +21,11 @@ uniform = /obj/item/clothing/under/rank/bartender id_type = /obj/item/weapon/card/id/civilian/bartender pda_type = /obj/item/device/pda/bar - backpack_contents = list(/obj/item/weapon/permit/gun/bar = 1) + backpack_contents = list(/obj/item/clothing/accessory/permit/gun/bar = 1) /decl/hierarchy/outfit/job/service/bartender/post_equip(mob/living/carbon/human/H) ..() - for(var/obj/item/weapon/permit/gun/bar/permit in H.back.contents) + for(var/obj/item/clothing/accessory/permit/gun/bar/permit in H.back.contents) permit.set_name(H.real_name) /decl/hierarchy/outfit/job/service/bartender/barista diff --git a/code/datums/outfits/jobs/medical.dm b/code/datums/outfits/jobs/medical.dm index 7e27fd34f8d..cbfd7302617 100644 --- a/code/datums/outfits/jobs/medical.dm +++ b/code/datums/outfits/jobs/medical.dm @@ -57,7 +57,6 @@ head = /obj/item/clothing/head/nursehat else uniform = /obj/item/clothing/under/rank/medical/scrubs/purple - head = /obj/item/clothing/head/nursehat ..() /decl/hierarchy/outfit/job/medical/chemist diff --git a/code/datums/outfits/military/fleet.dm b/code/datums/outfits/military/fleet.dm new file mode 100644 index 00000000000..9960372505f --- /dev/null +++ b/code/datums/outfits/military/fleet.dm @@ -0,0 +1,22 @@ +/decl/hierarchy/outfit/military/fleet/pt + name = "Fleet Uniform - PT" + uniform = /obj/item/clothing/under/pt/fleet + shoes = /obj/item/clothing/shoes/black + +/decl/hierarchy/outfit/military/fleet/utility + name = "Fleet Uniform - Utility" + uniform = /obj/item/clothing/under/utility/fleet + shoes = /obj/item/clothing/shoes/boots/jackboots + +/decl/hierarchy/outfit/military/fleet/service + name = "Fleet Uniform - Service" + uniform = /obj/item/clothing/under/service/fleet + shoes = /obj/item/clothing/shoes/dress/white + +/decl/hierarchy/outfit/military/fleet/dress + name = "Fleet Uniform - Dress" + uniform = /obj/item/clothing/under/service/fleet + shoes = /obj/item/clothing/shoes/dress/white + suit = /obj/item/clothing/suit/storage/toggle/dress/fleet + gloves = /obj/item/clothing/gloves/white + head = /obj/item/clothing/head/dress/fleet \ No newline at end of file diff --git a/code/datums/outfits/military/marines.dm b/code/datums/outfits/military/marines.dm new file mode 100644 index 00000000000..3fd59906531 --- /dev/null +++ b/code/datums/outfits/military/marines.dm @@ -0,0 +1,23 @@ +/decl/hierarchy/outfit/military/marine/pt + name = "Marine Uniform - PT" + uniform = /obj/item/clothing/under/pt/marine + shoes = /obj/item/clothing/shoes/black + +/decl/hierarchy/outfit/military/marine/utility + name = "Marine Uniform - Utility" + uniform = /obj/item/clothing/under/utility/marine + shoes = /obj/item/clothing/shoes/boots/jungle + +/decl/hierarchy/outfit/military/marine/service + name = "Marine Uniform - Service" + uniform = /obj/item/clothing/under/service/marine + shoes = /obj/item/clothing/shoes/dress + suit = /obj/item/clothing/suit/storage/service/marine + +/decl/hierarchy/outfit/military/marine/dress + name = "Marine Uniform - Dress" + uniform = /obj/item/clothing/under/mildress/marine + shoes = /obj/item/clothing/shoes/dress/white + suit = /obj/item/clothing/suit/dress/marine + gloves = /obj/item/clothing/gloves/white + head = /obj/item/clothing/head/dress/marine \ No newline at end of file diff --git a/code/datums/outfits/military/military.dm b/code/datums/outfits/military/military.dm new file mode 100644 index 00000000000..eb00eb6871d --- /dev/null +++ b/code/datums/outfits/military/military.dm @@ -0,0 +1,5 @@ +/decl/hierarchy/outfit/military + name = "Military Uniform" + hierarchy_type = /decl/hierarchy/outfit/military + + l_ear = /obj/item/device/radio/headset \ No newline at end of file diff --git a/code/datums/outfits/military/sifguard.dm b/code/datums/outfits/military/sifguard.dm new file mode 100644 index 00000000000..f417b55fe24 --- /dev/null +++ b/code/datums/outfits/military/sifguard.dm @@ -0,0 +1,23 @@ +/decl/hierarchy/outfit/military/sifguard/pt + name = "SifGuard Uniform - PT" + uniform = /obj/item/clothing/under/pt/expeditionary + shoes = /obj/item/clothing/shoes/black + +/decl/hierarchy/outfit/military/sifguard/utility + name = "SifGuard Uniform - Utility" + uniform = /obj/item/clothing/under/utility/expeditionary + shoes = /obj/item/clothing/shoes/boots/jackboots + +/decl/hierarchy/outfit/military/sifguard/service + name = "SifGuard Uniform - Service" + uniform = /obj/item/clothing/under/utility/expeditionary + shoes = /obj/item/clothing/shoes/boots/jackboots + suit = /obj/item/clothing/suit/storage/service/expeditionary + +/decl/hierarchy/outfit/military/sifguard/dress + name = "SifGuard Uniform - Dress" + uniform = /obj/item/clothing/under/mildress/expeditionary + shoes = /obj/item/clothing/shoes/dress + suit = /obj/item/clothing/suit/dress/expedition + gloves = /obj/item/clothing/gloves/white + head = /obj/item/clothing/head/dress/expedition \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 78f214ca7a2..9a4d8774fea 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1518,11 +1518,9 @@ // Called by job_controller. Makes drones start with a permit, might be useful for other people later too. /mob/living/carbon/human/equip_post_job() //Drone Permit moved to equip_survival_gear() - return -/* var/braintype = get_FBP_type() + var/braintype = get_FBP_type() if(braintype == FBP_DRONE) var/turf/T = get_turf(src) var/obj/item/clothing/accessory/permit/drone/permit = new(T) permit.set_name(real_name) - equip_to_appropriate_slot(permit) // If for some reason it can't find room, it'll still be on the floor. -*/ \ No newline at end of file + equip_to_appropriate_slot(permit) // If for some reason it can't find room, it'll still be on the floor. \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 29e4f5196f9..f07ce377d39 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -232,13 +232,6 @@ if (extendedtank) H.equip_to_slot_or_del(new boxtype(H.back), slot_in_backpack) else H.equip_to_slot_or_del(new boxtype(H.back), slot_in_backpack) - var/braintype = H.get_FBP_type() - if(braintype == FBP_DRONE) - var/turf/T = get_turf(H) - var/obj/item/weapon/permit/drone/permit = new(T) - permit.set_name(H.real_name) - H.equip_to_slot_or_del(permit, slot_in_backpack) - /datum/species/proc/create_organs(var/mob/living/carbon/human/H) //Handles creation of mob organs. H.mob_size = mob_size diff --git a/polaris.dme b/polaris.dme index 2fd1a3ced0d..56866630de0 100644 --- a/polaris.dme +++ b/polaris.dme @@ -243,6 +243,10 @@ #include "code\datums\outfits\jobs\misc.dm" #include "code\datums\outfits\jobs\science.dm" #include "code\datums\outfits\jobs\security.dm" +#include "code\datums\outfits\military\fleet.dm" +#include "code\datums\outfits\military\marines.dm" +#include "code\datums\outfits\military\military.dm" +#include "code\datums\outfits\military\sifguard.dm" #include "code\datums\repositories\cameras.dm" #include "code\datums\repositories\crew.dm" #include "code\datums\repositories\decls.dm"