diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index b108fc035b9..c5fb2e259cf 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -12,13 +12,18 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 H.equip_if_possible(new /obj/item/device/radio/headset/heads/captain(H), H.slot_ears) - H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back) + if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 4) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_norm(H), H.slot_back) H.equip_if_possible(new /obj/item/clothing/under/rank/captain(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/device/pda/captain(H), H.slot_belt) H.equip_if_possible(new /obj/item/clothing/shoes/brown(H), H.slot_shoes) H.equip_if_possible(new /obj/item/clothing/head/caphat(H), H.slot_head) H.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(H), H.slot_glasses) - H.equip_if_possible(new /obj/item/weapon/storage/id_kit(H), H.slot_in_backpack) + if(H.backbag == 1) + H.equip_if_possible(new /obj/item/weapon/storage/id_kit(H), H.slot_r_hand) + else + H.equip_if_possible(new /obj/item/weapon/storage/id_kit(H.back), H.slot_in_backpack) var/datum/organ/external/O = H.organs[pick(H.organs)] var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(O) O.implant += L @@ -43,12 +48,17 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 H.equip_if_possible(new /obj/item/device/radio/headset/heads/hop(H), H.slot_ears) - H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back) + if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 4) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_norm(H), H.slot_back) H.equip_if_possible(new /obj/item/clothing/under/rank/head_of_personnel(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/brown(H), H.slot_shoes) H.equip_if_possible(new /obj/item/device/pda/heads/hop(H), H.slot_belt) H.equip_if_possible(new /obj/item/clothing/suit/armor/vest(H), H.slot_wear_suit) H.equip_if_possible(new /obj/item/clothing/head/helmet(H), H.slot_head) - H.equip_if_possible(new /obj/item/weapon/storage/id_kit(H), H.slot_in_backpack) H.equip_if_possible(new /obj/item/clothing/gloves/blue(H), H.slot_gloves) + if(H.backbag == 1) + H.equip_if_possible(new /obj/item/weapon/storage/id_kit(H), H.slot_r_hand) + else + H.equip_if_possible(new /obj/item/weapon/storage/id_kit(H.back), H.slot_in_backpack) return 1 diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 956a6c8ea88..aa294a16ce5 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -12,14 +12,27 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back) - H.equip_if_possible(new /obj/item/clothing/under/rank/bartender(H), H.slot_w_uniform) + if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 4) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_norm(H), H.slot_back) H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes) H.equip_if_possible(new /obj/item/clothing/suit/armor/vest(H), H.slot_wear_suit) - H.equip_if_possible(new /obj/item/ammo_casing/shotgun/beanbag(H), H.slot_in_backpack) - H.equip_if_possible(new /obj/item/ammo_casing/shotgun/beanbag(H), H.slot_in_backpack) - H.equip_if_possible(new /obj/item/ammo_casing/shotgun/beanbag(H), H.slot_in_backpack) - H.equip_if_possible(new /obj/item/ammo_casing/shotgun/beanbag(H), H.slot_in_backpack) + H.equip_if_possible(new /obj/item/clothing/under/rank/bartender(H), H.slot_w_uniform) + + if(H.backbag == 1) + var/obj/item/weapon/storage/box/Barpack = new /obj/item/weapon/storage/box(H) + H.equip_if_possible(Barpack, H.slot_r_hand) + new /obj/item/ammo_casing/shotgun/beanbag(Barpack) + new /obj/item/ammo_casing/shotgun/beanbag(Barpack) + new /obj/item/ammo_casing/shotgun/beanbag(Barpack) + new /obj/item/ammo_casing/shotgun/beanbag(Barpack) + else + H.equip_if_possible(new /obj/item/weapon/storage/box(H), H.slot_in_backpack) + H.equip_if_possible(new /obj/item/ammo_casing/shotgun/beanbag(H), H.slot_in_backpack) + H.equip_if_possible(new /obj/item/ammo_casing/shotgun/beanbag(H), H.slot_in_backpack) + H.equip_if_possible(new /obj/item/ammo_casing/shotgun/beanbag(H), H.slot_in_backpack) + H.equip_if_possible(new /obj/item/ammo_casing/shotgun/beanbag(H), H.slot_in_backpack) + return 1 @@ -126,11 +139,19 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 H.equip_if_possible(new /obj/item/device/radio/headset/headset_mine (H), H.slot_ears) - H.equip_if_possible(new /obj/item/weapon/storage/backpack/industrial (H), H.slot_back) + if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/industrial (H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 4) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_eng(H), H.slot_back) H.equip_if_possible(new /obj/item/clothing/under/rank/miner(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes) - H.equip_if_possible(new /obj/item/weapon/crowbar(H), H.slot_in_backpack) - H.equip_if_possible(new /obj/item/weapon/satchel(H), H.slot_in_backpack) + if(H.backbag == 1) + H.equip_if_possible(new /obj/item/weapon/storage/box(H), H.slot_r_hand) + H.equip_if_possible(new /obj/item/weapon/crowbar(H), H.slot_l_hand) + H.equip_if_possible(new /obj/item/weapon/satchel(H), H.slot_l_store) + else + H.equip_if_possible(new /obj/item/weapon/storage/box(H.back), H.slot_in_backpack) + H.equip_if_possible(new /obj/item/weapon/crowbar(H), H.slot_in_backpack) + H.equip_if_possible(new /obj/item/weapon/satchel(H), H.slot_in_backpack) return 1 @@ -179,8 +200,8 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back) - H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H.back), H.slot_in_backpack) + if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) H.equip_if_possible(new /obj/item/clothing/under/mime(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes) H.equip_if_possible(new /obj/item/device/pda/mime(H), H.slot_belt) @@ -188,8 +209,14 @@ H.equip_if_possible(new /obj/item/clothing/mask/gas/mime(H), H.slot_wear_mask) H.equip_if_possible(new /obj/item/clothing/head/beret(H), H.slot_head) H.equip_if_possible(new /obj/item/clothing/suit/suspenders(H), H.slot_wear_suit) - H.equip_if_possible(new /obj/item/toy/crayon/mime(H), H.slot_in_backpack) - H.equip_if_possible(new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(H), H.slot_in_backpack) + if(H.backbag == 1) + H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H), H.slot_r_hand) + H.equip_if_possible(new /obj/item/toy/crayon/mime(H), H.slot_l_store) + H.equip_if_possible(new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(H), H.slot_l_hand) + else + H.equip_if_possible(new /obj/item/weapon/storage/box/survival(H.back), H.slot_in_backpack) + H.equip_if_possible(new /obj/item/toy/crayon/mime(H), H.slot_in_backpack) + H.equip_if_possible(new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(H), H.slot_in_backpack) H.verbs += /client/proc/mimespeak H.verbs += /client/proc/mimewall H.mind.special_verbs += /client/proc/mimespeak @@ -256,7 +283,6 @@ var/global/lawyer = 0//Checks for another lawyer equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back) if(!lawyer) lawyer = 1 H.equip_if_possible(new /obj/item/clothing/under/lawyer/bluesuit(H), H.slot_w_uniform) @@ -266,7 +292,6 @@ var/global/lawyer = 0//Checks for another lawyer H.equip_if_possible(new /obj/item/clothing/suit/lawyer/purpjacket(H), H.slot_wear_suit) H.equip_if_possible(new /obj/item/clothing/shoes/brown(H), H.slot_shoes) H.equip_if_possible(new /obj/item/device/pda/lawyer(H), H.slot_belt) - H.equip_if_possible(new /obj/item/device/detective_scanner(H), H.slot_in_backpack)//Why do they even get this? H.equip_if_possible(new /obj/item/weapon/storage/briefcase(H), H.slot_l_hand) return 1 diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index c69a85ae84b..df37a83acd8 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -12,7 +12,9 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 H.equip_if_possible(new /obj/item/device/radio/headset/heads/ce(H), H.slot_ears) - H.equip_if_possible(new /obj/item/weapon/storage/backpack/industrial (H), H.slot_back) + if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/industrial (H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 4) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_eng(H), H.slot_back) H.equip_if_possible(new /obj/item/clothing/under/rank/chief_engineer(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/device/pda/heads/ce(H), H.slot_l_store) H.equip_if_possible(new /obj/item/clothing/shoes/brown(H), H.slot_shoes) @@ -55,13 +57,15 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 H.equip_if_possible(new /obj/item/device/radio/headset/headset_eng(H), H.slot_ears) - H.equip_if_possible(new /obj/item/weapon/storage/backpack/industrial(H), H.slot_back) + if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/industrial(H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 4) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_eng(H), H.slot_back) H.equip_if_possible(new /obj/item/clothing/under/rank/engineer(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/orange(H), H.slot_shoes) - H.equip_if_possible(new /obj/item/device/pda/engineering(H), H.slot_l_store) - H.equip_if_possible(new /obj/item/clothing/head/helmet/hardhat(H), H.slot_head) H.equip_if_possible(new /obj/item/weapon/storage/belt/utility/full(H), H.slot_belt) + H.equip_if_possible(new /obj/item/clothing/head/helmet/hardhat(H), H.slot_head) H.equip_if_possible(new /obj/item/device/t_scanner(H), H.slot_r_store) + H.equip_if_possible(new /obj/item/device/pda/engineering(H), H.slot_l_store) return 1 @@ -80,12 +84,18 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 H.equip_if_possible(new /obj/item/device/radio/headset/headset_eng(H), H.slot_ears) + if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 4) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_norm(H), H.slot_back) H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back) - H.equip_if_possible(new /obj/item/weapon/storage/box/engineer(H.back), H.slot_in_backpack) H.equip_if_possible(new /obj/item/clothing/under/rank/atmospheric_technician(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes) - H.equip_if_possible(new /obj/item/device/pda/engineering(H), H.slot_belt) - H.equip_if_possible(new /obj/item/weapon/storage/toolbox/mechanical(H), H.slot_l_hand) + H.equip_if_possible(new /obj/item/device/pda/engineering(H), H.slot_l_store) + H.equip_if_possible(new /obj/item/weapon/storage/belt/utility/atmostech/(H), H.slot_belt) + if(H.backbag == 1) + H.equip_if_possible(new /obj/item/weapon/storage/box/engineer(H), H.slot_r_hand) + else + H.equip_if_possible(new /obj/item/weapon/storage/box/engineer(H.back), H.slot_in_backpack) return 1 @@ -102,8 +112,10 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_if_possible(new /obj/item/device/radio/headset/headset_eng(H), H.slot_ears) - H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back) + H.equip_if_possible(new /obj/item/device/radio/headset/headset_rob(H), H.slot_ears) + if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 4) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_norm(H), H.slot_back) H.equip_if_possible(new /obj/item/clothing/under/rank/roboticist(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes) H.equip_if_possible(new /obj/item/device/pda/engineering(H), H.slot_belt) diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index f7e28dd9de8..5a4220828dc 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -12,7 +12,9 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 H.equip_if_possible(new /obj/item/device/radio/headset/heads/cmo(H), H.slot_ears) - H.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (H), H.slot_back) + if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 4) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_med(H), H.slot_back) H.equip_if_possible(new /obj/item/clothing/under/rank/chief_medical_officer(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/brown(H), H.slot_shoes) H.equip_if_possible(new /obj/item/device/pda/heads/cmo(H), H.slot_belt) @@ -39,7 +41,13 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 H.equip_if_possible(new /obj/item/device/radio/headset/headset_med(H), H.slot_ears) - H.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (H), H.slot_back) + if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 4) + if(alt_titles == "Virologist") + H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_vir(H), H.slot_back) + else + H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_med(H), H.slot_back) H.equip_if_possible(new /obj/item/clothing/under/rank/medical(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/white(H), H.slot_shoes) H.equip_if_possible(new /obj/item/device/pda/medical(H), H.slot_belt) @@ -65,7 +73,9 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 H.equip_if_possible(new /obj/item/device/radio/headset/headset_medsci(H), H.slot_ears) - H.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (H), H.slot_back) + if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 4) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_gen(H), H.slot_back) H.equip_if_possible(new /obj/item/clothing/under/rank/geneticist(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/white(H), H.slot_shoes) H.equip_if_possible(new /obj/item/device/pda/medical(H), H.slot_belt) @@ -88,13 +98,14 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_if_possible(new /obj/item/device/radio/headset/headset_med(H), H.slot_ears) - H.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (H), H.slot_back) - H.equip_if_possible(new /obj/item/clothing/under/rank/medical(H), H.slot_w_uniform) + H.equip_if_possible(new /obj/item/device/radio/headset/headset_medsci(H), H.slot_ears) + if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + H.equip_if_possible(new /obj/item/clothing/under/rank/virologist(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/device/pda/medical(H), H.slot_belt) H.equip_if_possible(new /obj/item/clothing/mask/surgical(H), H.slot_wear_mask) H.equip_if_possible(new /obj/item/clothing/shoes/white(H), H.slot_shoes) - H.equip_if_possible(new /obj/item/clothing/suit/storage/labcoat/virologist(H), H.slot_wear_suit) + H.equip_if_possible(new /obj/item/clothing/suit/labcoat/virologist(H), H.slot_wear_suit) H.equip_if_possible(new /obj/item/device/flashlight/pen(H), H.slot_s_store) return 1 */ diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index 255e8ad58d8..d3eb18db922 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -35,6 +35,9 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 + if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 4) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_tox(H), H.slot_back) H.equip_if_possible(new /obj/item/device/radio/headset/headset_sci(H), H.slot_ears) H.equip_if_possible(new /obj/item/clothing/under/rank/scientist(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/white(H), H.slot_shoes) @@ -59,6 +62,9 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 + if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 4) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_chem(H), H.slot_back) H.equip_if_possible(new /obj/item/device/radio/headset/headset_medsci(H), H.slot_ears) H.equip_if_possible(new /obj/item/clothing/under/rank/chemist(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/white(H), H.slot_shoes) diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index bd22ac8a450..364508ee048 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -11,7 +11,9 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_if_possible(new /obj/item/weapon/storage/backpack/security (H), H.slot_back) + if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/security (H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 4) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_sec(H), H.slot_back) H.equip_if_possible(new /obj/item/device/radio/headset/heads/hos(H), H.slot_ears) H.equip_if_possible(new /obj/item/clothing/under/rank/head_of_security(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/suit/storage/armourrigvest(H), H.slot_wear_suit) @@ -47,7 +49,9 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 H.equip_if_possible(new /obj/item/device/radio/headset/headset_sec(H), H.slot_ears) - H.equip_if_possible(new /obj/item/weapon/storage/backpack/security(H), H.slot_back) + if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/security(H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 4) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_sec(H), H.slot_back) H.equip_if_possible(new /obj/item/clothing/under/rank/warden(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/jackboots(H), H.slot_shoes) H.equip_if_possible(new /obj/item/device/pda/security(H), H.slot_belt) @@ -81,7 +85,9 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 H.equip_if_possible(new /obj/item/device/radio/headset/headset_sec(H), H.slot_ears) - H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back) + if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 4) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_norm(H), H.slot_back) H.equip_if_possible(new /obj/item/clothing/under/det(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/suit/storage/det_suit(H), H.slot_wear_suit) H.equip_if_possible(new /obj/item/clothing/shoes/brown(H), H.slot_shoes) @@ -122,7 +128,9 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 H.equip_if_possible(new /obj/item/device/radio/headset/headset_sec(H), H.slot_ears) - H.equip_if_possible(new /obj/item/weapon/storage/backpack/security(H), H.slot_back) + if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/security(H), H.slot_back) + if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) + if(H.backbag == 4) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_sec(H), H.slot_back) H.equip_if_possible(new /obj/item/clothing/under/rank/security(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/jackboots(H), H.slot_shoes) H.equip_if_possible(new /obj/item/device/pda/security(H), H.slot_belt) diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index cf2f443dcff..0f079a9ffed 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -244,9 +244,26 @@ var/global/datum/controller/occupations/job_master // make sure we don't already have one on 1 ear :p if(!istype(H.r_ear,/obj/item/device/radio/headset) && !istype(H.l_ear,/obj/item/device/radio/headset)) H.equip_if_possible(new /obj/item/device/radio/headset(H), H.slot_ears) - var/obj/item/weapon/storage/backpack/BPK = new/obj/item/weapon/storage/backpack(H) - H.equip_if_possible(BPK, H.slot_back,1) - H.equip_if_possible(new /obj/item/weapon/storage/box(H.back), H.slot_in_backpack) + + if(H.mind && H.mind.assigned_role != "Cyborg" && H.mind.assigned_role != "AI" && H.mind.assigned_role != "Clown") + if(H.backbag == 1) //Clown always gets his backbuddy. + H.equip_if_possible(new /obj/item/weapon/storage/box(H), H.slot_r_hand) + + if(H.backbag == 2) + var/obj/item/weapon/storage/backpack/BPK = new/obj/item/weapon/storage/backpack(H) + new /obj/item/weapon/storage/box(BPK) + H.equip_if_possible(BPK, H.slot_back,1) + + if(H.backbag == 3) + var/obj/item/weapon/storage/backpack/BPK = new/obj/item/weapon/storage/backpack/satchel(H) + new /obj/item/weapon/storage/box(BPK) + H.equip_if_possible(BPK, H.slot_back,1) + + if(H.backbag == 4) + var/obj/item/weapon/storage/backpack/BPK = new/obj/item/weapon/storage/backpack/satchel_norm(H) + new /obj/item/weapon/storage/box(BPK) + H.equip_if_possible(BPK, H.slot_back,1) + //Give'em glasses if they are nearsighted if(H.disabilities & 1) var/equipped = H.equip_if_possible(new /obj/item/clothing/glasses/regular(H), H.slot_glasses) diff --git a/code/game/objects/storage/belt.dm b/code/game/objects/storage/belt.dm index c001a0028f3..57c2e45314d 100644 --- a/code/game/objects/storage/belt.dm +++ b/code/game/objects/storage/belt.dm @@ -77,6 +77,15 @@ new /obj/item/weapon/wirecutters(src) new /obj/item/weapon/cable_coil(src,30,pick("red","yellow")) +/obj/item/weapon/storage/belt/utility/atmostech/New() + ..() + new /obj/item/weapon/screwdriver(src) + new /obj/item/weapon/wrench(src) + new /obj/item/weapon/weldingtool(src) + new /obj/item/weapon/crowbar(src) + new /obj/item/weapon/wirecutters(src) + new /obj/item/device/analyzer(src) + /obj/item/weapon/storage/belt/security/full/New() ..() new /obj/item/weapon/melee/baton(src) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index ae9f4237584..7468e15cb98 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1471,8 +1471,8 @@ stand_icon.Blend(rgb(100,100,100)) lying_icon.Blend(rgb(100,100,100)) - if (underwear > 0) - //if(!obese) + if (underwear < 6 && underwear > 0) +// if(!obese) stand_icon.Blend(new /icon('human.dmi', "underwear[underwear]_[g]_s"), ICON_OVERLAY) lying_icon.Blend(new /icon('human.dmi', "underwear[underwear]_[g]_l"), ICON_OVERLAY) diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index b7dac4247e2..1da6a25f4f3 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -29,6 +29,7 @@ var/maxHealth = 100 //Living //Vars that should only be accessed via procs ++END + // var/uses_hud = 0 var/obj/screen/pain = null var/obj/screen/flash = null @@ -127,6 +128,7 @@ var/jitteriness = 0//Carbon var/charges = 0.0 var/nutrition = 400.0//Carbon + var/overeatduration = 0 // How long this guy is overeating //Carbon var/paralysis = 0.0 var/stunned = 0.0 @@ -252,6 +254,7 @@ var/robot_talk_understand = 0 var/alien_talk_understand = 0 var/taj_talk_understand = 0 + //You can guess what these are for. --SkyMarshal var/list/atom/hallucinations = list() var/halloss = 0 diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm index d67d5839612..07c5f9436fa 100644 --- a/code/modules/mob/new_player/preferences.dm +++ b/code/modules/mob/new_player/preferences.dm @@ -67,6 +67,10 @@ datum/preferences //Just like it sounds ooccolor = "#b82e00" underwear = 1 + list/underwear_m = list("White", "Grey", "Green", "Blue", "Black", "None") //Curse whoever made male/female underwear diffrent colours + list/underwear_f = list("Red", "White", "Yellow", "Blue", "Black", "None") + backbag = 2 + list/backbaglist = list("Nothing", "Backpack", "Satchel", "Satchel Alt") //Hair type h_style = "Short Hair" @@ -252,13 +256,18 @@ datum/preferences dat += "\tSet Skills
" dat += "
" + if(job.alt_titles) + HTML += "\[[GetAltTitle(job)]\]" + else + HTML += "" HTML += "
Body " - dat += "(®)" // Random look + dat += "(®)" // Random look dat += "
" dat += "Blood Type: [b_type]
" dat += "Skin Tone: [-s_tone + 35]/220
" - if(!IsGuestKey(user.key)) - dat += "Underwear: [underwear == 1 ? "Yes" : "No"]
" + // if(!IsGuestKey(user.key))//Seeing as it doesn't do anything, it may as well not show up. + if(gender == MALE) + dat += "Underwear: [underwear_m[underwear]]
" + else + dat += "Underwear: [underwear_f[underwear]]
" + + dat += "Backpack Type:
[backbaglist[backbag]]
" dat += "		Preview
" dat += "<" @@ -401,7 +410,10 @@ datum/preferences HTML += " \[Low]" else HTML += " \[NEVER]" - HTML += "

" HTML += "\[Done\]" @@ -754,19 +766,30 @@ datum/preferences ghost_ears = !ghost_ears if(link_tags["underwear"]) - if(!IsGuestKey(user.key)) - /*switch(link_tags["underwear"]) - if("random") - if(prob (75)) - underwear = 1 - else - underwear = 0 - if("input") - if(underwear == 1) - underwear = 0 - else - underwear = 1*/ - underwear = !underwear + switch(link_tags["underwear"]) + if("inputmale") + var/tempUnderwear = input(user, "Please select your underwear colour:", "Character Generation") as null|anything in underwear_m + if(tempUnderwear) + underwear = underwear_m.Find(tempUnderwear) + if("inputfemale") + var/tempUnderwear = input(user, "Please select your underwear colour:", "Character Generation") as null|anything in underwear_f + if(tempUnderwear) + underwear = underwear_f.Find(tempUnderwear) + if("random") + if(prob (75)) + underwear = pick(1,2,3,4,5) + else + underwear = 6 + + if(link_tags["backbag_type"]) + switch(link_tags["backbag_type"]) + if("input") + var/tempBag = input(user, "Please pick a backpack type:", "Character Generation") as null|anything in backbaglist + if(tempBag) + backbag = backbaglist.Find(tempBag) + if("random") + backbag = pick(1,2,3) + if(link_tags["be_special"]) src.be_special^=(1< 6 || underwear < 1) + underwear = 1 //I'm sure this is 100% unnecessary, but I'm paranoid... sue me. + character.underwear = underwear + + if(backbag > 4 || backbag < 1) + backbag = 1 //Same as above + character.backbag = backbag + character.underwear = underwear == 1 ? pick(1,2,3,4,5) : 0 character.used_skillpoints = used_skillpoints diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index 793acfc5f74..b75fef33f1d 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -13,6 +13,7 @@ datum/preferences randomize_hair_color("facial") randomize_eyes_color() underwear = 1 + backbag = 2 b_type = pick("A+", "A-", "B+", "B-", "AB+", "AB-", "O+", "O-") age = rand(19,35) copy_to(H,1) @@ -216,7 +217,7 @@ datum/preferences else preview_icon.Blend(rgb(-s_tone, -s_tone, -s_tone), ICON_SUBTRACT) - if (underwear > 0) + if (underwear < 6) preview_icon.Blend(new /icon('human.dmi', "underwear[underwear]_[g]_s", "dir" = preview_dir), ICON_OVERLAY) var/icon/eyes_s = new/icon("icon" = 'human_face.dmi', "icon_state" = "eyes_s", "dir" = preview_dir) diff --git a/code/modules/mob/new_player/savefile.dm b/code/modules/mob/new_player/savefile.dm index cffc522970d..39f01512710 100644 --- a/code/modules/mob/new_player/savefile.dm +++ b/code/modules/mob/new_player/savefile.dm @@ -132,6 +132,10 @@ datum/preferences/proc/savefile_save(mob/user, slot) F["eyes_blue"] << src.b_eyes F["blood_type"] << src.b_type F["underwear"] << src.underwear + F["backbag"] << src.backbag + F["backbag"] << src.backbag + + F["be_special"] << src.be_special F["UI"] << src.UI @@ -200,6 +204,9 @@ datum/preferences/proc/savefile_load(mob/user, slot) F["eyes_blue"] >> src.b_eyes F["blood_type"] >> src.b_type F["underwear"] >> src.underwear + if(underwear == 0) underwear = 6 //For old players who have 0 in their savefile + F["backbag"] >> src.backbag + if(isnull(backbag)) backbag = 2 F["name_is_always_random"] >> src.be_random_name F["midis"] >> src.midis F["ghost_ears"] >> src.ghost_ears