cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Items that fail to equip on spawn are now collected in a plastic bag and given to the user.

Browse Source 
Fixes shit spawning in the start area, and fatties losing IDs, PDAs, and survival boxes.
This commit is contained in:
Rob Nelson
2014-01-19 23:39:32 -08:00
parent 25c64709d8
commit 6ec6edcb97
14 changed files with 381 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/jobs/job/assistant.dm
View File

@@ -13,9 +13,9 @@
/datum/job/assistant/equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_to_slot_or_drop(new /obj/item/clothing/under/color/grey(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/clothing/shoes/black(H), slot_shoes)
H.equip_to_slot_or_drop(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_or_collect(new /obj/item/clothing/under/color/grey(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes)
H.equip_or_collect(new H.species.survival_gear(H.back), slot_in_backpack)
return 1
/datum/job/assistant/get_access()

44
code/game/jobs/job/captain.dm
View File

@@ -14,23 +14,23 @@
minimal_player_age = 14
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_to_slot_or_drop(new /obj/item/device/radio/headset/heads/captain(H), slot_l_ear)
H.equip_or_collect(new /obj/item/device/radio/headset/heads/captain(H), slot_l_ear)
switch(H.backbag)
if(2) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/captain(H), slot_back)
if(3) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel_cap(H), slot_back)
if(4) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_to_slot_or_drop(new H.species.survival_gear(H.back), slot_in_backpack)
if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack/captain(H), slot_back)
if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_cap(H), slot_back)
if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_or_collect(new H.species.survival_gear(H.back), slot_in_backpack)
var/obj/item/clothing/under/U = new /obj/item/clothing/under/rank/captain(H)
U.hastie = new /obj/item/clothing/tie/medal/gold/captain(U)
H.equip_to_slot_or_drop(U, slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/device/pda/captain(H), slot_belt)
H.equip_to_slot_or_drop(new /obj/item/clothing/shoes/brown(H), slot_shoes)
H.equip_to_slot_or_drop(new /obj/item/clothing/head/caphat(H), slot_head)
H.equip_to_slot_or_drop(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses)
H.equip_or_collect(U, slot_w_uniform)
H.equip_or_collect(new /obj/item/device/pda/captain(H), slot_belt)
H.equip_or_collect(new /obj/item/clothing/shoes/brown(H), slot_shoes)
H.equip_or_collect(new /obj/item/clothing/head/caphat(H), slot_head)
H.equip_or_collect(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses)
if(H.backbag == 1)
H.equip_to_slot_or_drop(new /obj/item/weapon/storage/box/ids(H), slot_r_hand)
H.equip_or_collect(new /obj/item/weapon/storage/box/ids(H), slot_r_hand)
else
H.equip_to_slot_or_drop(new /obj/item/weapon/storage/box/ids(H.back), slot_in_backpack)
H.equip_or_collect(new /obj/item/weapon/storage/box/ids(H.back), slot_in_backpack)
var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
L.imp_in = H
L.implanted = 1
@@ -73,17 +73,17 @@
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_to_slot_or_drop(new /obj/item/device/radio/headset/heads/hop(H), slot_l_ear)
H.equip_or_collect(new /obj/item/device/radio/headset/heads/hop(H), slot_l_ear)
switch(H.backbag)
if(2) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack(H), slot_back)
if(3) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
if(4) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_to_slot_or_drop(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/head_of_personnel(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/clothing/shoes/brown(H), slot_shoes)
H.equip_to_slot_or_drop(new /obj/item/device/pda/heads/hop(H), slot_belt)
if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack(H), slot_back)
if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_or_collect(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_or_collect(new /obj/item/clothing/under/rank/head_of_personnel(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/shoes/brown(H), slot_shoes)
H.equip_or_collect(new /obj/item/device/pda/heads/hop(H), slot_belt)
if(H.backbag == 1)
H.equip_to_slot_or_drop(new /obj/item/weapon/storage/box/ids(H), slot_r_hand)
H.equip_or_collect(new /obj/item/weapon/storage/box/ids(H), slot_r_hand)
else
H.equip_to_slot_or_drop(new /obj/item/weapon/storage/box/ids(H.back), slot_in_backpack)
H.equip_or_collect(new /obj/item/weapon/storage/box/ids(H.back), slot_in_backpack)
return 1

216
code/game/jobs/job/civilian.dm
View File

@@ -15,27 +15,27 @@
equip(var/mob/living/carbon/human/H)
if(!H) return 0
switch(H.backbag)
if(2) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack(H), slot_back)
if(3) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
if(4) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_to_slot_or_drop(new /obj/item/clothing/shoes/black(H), slot_shoes)
H.equip_to_slot_or_drop(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit)
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/bartender(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/device/pda/bar(H), slot_belt)
if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack(H), slot_back)
if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes)
H.equip_or_collect(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit)
H.equip_or_collect(new /obj/item/clothing/under/rank/bartender(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/device/pda/bar(H), slot_belt)
if(H.backbag == 1)
var/obj/item/weapon/storage/box/survival/Barpack = new H.species.survival_gear(H)
H.equip_to_slot_or_drop(Barpack, slot_r_hand)
H.equip_or_collect(Barpack, 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_to_slot_or_drop(new H.species.survival_gear(H), slot_in_backpack)
H.equip_to_slot_or_drop(new /obj/item/ammo_casing/shotgun/beanbag(H), slot_in_backpack)
H.equip_to_slot_or_drop(new /obj/item/ammo_casing/shotgun/beanbag(H), slot_in_backpack)
H.equip_to_slot_or_drop(new /obj/item/ammo_casing/shotgun/beanbag(H), slot_in_backpack)
H.equip_to_slot_or_drop(new /obj/item/ammo_casing/shotgun/beanbag(H), slot_in_backpack)
H.equip_or_collect(new H.species.survival_gear(H), slot_in_backpack)
H.equip_or_collect(new /obj/item/ammo_casing/shotgun/beanbag(H), slot_in_backpack)
H.equip_or_collect(new /obj/item/ammo_casing/shotgun/beanbag(H), slot_in_backpack)
H.equip_or_collect(new /obj/item/ammo_casing/shotgun/beanbag(H), slot_in_backpack)
H.equip_or_collect(new /obj/item/ammo_casing/shotgun/beanbag(H), slot_in_backpack)
return 1
@@ -57,15 +57,15 @@
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/chef(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/clothing/suit/chef(H), slot_wear_suit)
H.equip_to_slot_or_drop(new /obj/item/clothing/shoes/black(H), slot_shoes)
H.equip_to_slot_or_drop(new /obj/item/clothing/head/chefhat(H), slot_head)
H.equip_to_slot_or_drop(new /obj/item/device/pda/chef(H), slot_belt)
H.equip_or_collect(new /obj/item/clothing/under/rank/chef(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/suit/chef(H), slot_wear_suit)
H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes)
H.equip_or_collect(new /obj/item/clothing/head/chefhat(H), slot_head)
H.equip_or_collect(new /obj/item/device/pda/chef(H), slot_belt)
if(H.backbag == 1)
H.equip_to_slot_or_drop(new H.species.survival_gear(H), slot_r_hand)
H.equip_or_collect(new H.species.survival_gear(H), slot_r_hand)
else
H.equip_to_slot_or_drop(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_or_collect(new H.species.survival_gear(H.back), slot_in_backpack)
return 1
@@ -86,16 +86,16 @@
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/hydroponics(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/clothing/shoes/black(H), slot_shoes)
H.equip_to_slot_or_drop(new /obj/item/clothing/gloves/botanic_leather(H), slot_gloves)
H.equip_to_slot_or_drop(new /obj/item/clothing/suit/apron(H), slot_wear_suit)
H.equip_to_slot_or_drop(new /obj/item/device/analyzer/plant_analyzer(H), slot_s_store)
H.equip_to_slot_or_drop(new /obj/item/device/pda/botanist(H), slot_belt)
H.equip_or_collect(new /obj/item/clothing/under/rank/hydroponics(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes)
H.equip_or_collect(new /obj/item/clothing/gloves/botanic_leather(H), slot_gloves)
H.equip_or_collect(new /obj/item/clothing/suit/apron(H), slot_wear_suit)
H.equip_or_collect(new /obj/item/device/analyzer/plant_analyzer(H), slot_s_store)
H.equip_or_collect(new /obj/item/device/pda/botanist(H), slot_belt)
if(H.backbag == 1)
H.equip_to_slot_or_drop(new H.species.survival_gear(H), slot_r_hand)
H.equip_or_collect(new H.species.survival_gear(H), slot_r_hand)
else
H.equip_to_slot_or_drop(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_or_collect(new H.species.survival_gear(H.back), slot_in_backpack)
return 1
@@ -116,17 +116,17 @@
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_to_slot_or_drop(new /obj/item/device/radio/headset/headset_cargo(H), slot_l_ear)
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/cargo(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/clothing/shoes/brown(H), slot_shoes)
H.equip_to_slot_or_drop(new /obj/item/device/pda/quartermaster(H), slot_belt)
// H.equip_to_slot_or_drop(new /obj/item/clothing/gloves/black(H), slot_gloves)
H.equip_to_slot_or_drop(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses)
H.equip_to_slot_or_drop(new /obj/item/weapon/clipboard(H), slot_l_hand)
H.equip_or_collect(new /obj/item/device/radio/headset/headset_cargo(H), slot_l_ear)
H.equip_or_collect(new /obj/item/clothing/under/rank/cargo(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/shoes/brown(H), slot_shoes)
H.equip_or_collect(new /obj/item/device/pda/quartermaster(H), slot_belt)
// H.equip_or_collect(new /obj/item/clothing/gloves/black(H), slot_gloves)
H.equip_or_collect(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses)
H.equip_or_collect(new /obj/item/weapon/clipboard(H), slot_l_hand)
if(H.backbag == 1)
H.equip_to_slot_or_drop(new H.species.survival_gear(H), slot_r_hand)
H.equip_or_collect(new H.species.survival_gear(H), slot_r_hand)
else
H.equip_to_slot_or_drop(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_or_collect(new H.species.survival_gear(H.back), slot_in_backpack)
return 1
@@ -146,15 +146,15 @@
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_to_slot_or_drop(new /obj/item/device/radio/headset/headset_cargo(H), slot_l_ear)
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/cargotech(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/clothing/shoes/black(H), slot_shoes)
H.equip_to_slot_or_drop(new /obj/item/device/pda/cargo(H), slot_belt)
// H.equip_to_slot_or_drop(new /obj/item/clothing/gloves/black(H), slot_gloves)
H.equip_or_collect(new /obj/item/device/radio/headset/headset_cargo(H), slot_l_ear)
H.equip_or_collect(new /obj/item/clothing/under/rank/cargotech(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes)
H.equip_or_collect(new /obj/item/device/pda/cargo(H), slot_belt)
// H.equip_or_collect(new /obj/item/clothing/gloves/black(H), slot_gloves)
if(H.backbag == 1)
H.equip_to_slot_or_drop(new H.species.survival_gear(H), slot_r_hand)
H.equip_or_collect(new H.species.survival_gear(H), slot_r_hand)
else
H.equip_to_slot_or_drop(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_or_collect(new H.species.survival_gear(H.back), slot_in_backpack)
return 1
@@ -174,23 +174,23 @@
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_to_slot_or_drop(new /obj/item/device/radio/headset/headset_cargo (H), slot_l_ear)
H.equip_or_collect(new /obj/item/device/radio/headset/headset_cargo (H), slot_l_ear)
switch(H.backbag)
if(2) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/industrial(H), slot_back)
if(3) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel_eng(H), slot_back)
if(4) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/miner(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/device/pda/shaftminer(H), slot_belt)
H.equip_to_slot_or_drop(new /obj/item/clothing/shoes/black(H), slot_shoes)
// H.equip_to_slot_or_drop(new /obj/item/clothing/gloves/black(H), slot_gloves)
if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack/industrial(H), slot_back)
if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_eng(H), slot_back)
if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_or_collect(new /obj/item/clothing/under/rank/miner(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/device/pda/shaftminer(H), slot_belt)
H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes)
// H.equip_or_collect(new /obj/item/clothing/gloves/black(H), slot_gloves)
if(H.backbag == 1)
H.equip_to_slot_or_drop(new /obj/item/weapon/storage/box/engineer(H), slot_r_hand)
H.equip_to_slot_or_drop(new /obj/item/weapon/crowbar(H), slot_l_hand)
H.equip_to_slot_or_drop(new /obj/item/weapon/storage/bag/ore(H), slot_l_store)
H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H), slot_r_hand)
H.equip_or_collect(new /obj/item/weapon/crowbar(H), slot_l_hand)
H.equip_or_collect(new /obj/item/weapon/storage/bag/ore(H), slot_l_store)
else
H.equip_to_slot_or_drop(new /obj/item/weapon/storage/box/engineer(H.back), slot_in_backpack)
H.equip_to_slot_or_drop(new /obj/item/weapon/crowbar(H), slot_in_backpack)
H.equip_to_slot_or_drop(new /obj/item/weapon/storage/bag/ore(H), slot_in_backpack)
H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H.back), slot_in_backpack)
H.equip_or_collect(new /obj/item/weapon/crowbar(H), slot_in_backpack)
H.equip_or_collect(new /obj/item/weapon/storage/bag/ore(H), slot_in_backpack)
return 1
@@ -212,18 +212,18 @@
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/clown(H), slot_back)
H.equip_to_slot_or_drop(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/clown(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/clothing/shoes/clown_shoes(H), slot_shoes)
H.equip_to_slot_or_drop(new /obj/item/device/pda/clown(H), slot_belt)
H.equip_to_slot_or_drop(new /obj/item/clothing/mask/gas/clown_hat(H), slot_wear_mask)
H.equip_to_slot_or_drop(new /obj/item/weapon/reagent_containers/food/snacks/grown/banana(H), slot_in_backpack)
H.equip_to_slot_or_drop(new /obj/item/weapon/bikehorn(H), slot_in_backpack)
H.equip_to_slot_or_drop(new /obj/item/weapon/stamp/clown(H), slot_in_backpack)
H.equip_to_slot_or_drop(new /obj/item/toy/crayon/rainbow(H), slot_in_backpack)
H.equip_to_slot_or_drop(new /obj/item/weapon/storage/fancy/crayons(H), slot_in_backpack)
H.equip_to_slot_or_drop(new /obj/item/toy/waterflower(H), slot_in_backpack)
H.equip_or_collect(new /obj/item/weapon/storage/backpack/clown(H), slot_back)
H.equip_or_collect(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_or_collect(new /obj/item/clothing/under/rank/clown(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/shoes/clown_shoes(H), slot_shoes)
H.equip_or_collect(new /obj/item/device/pda/clown(H), slot_belt)
H.equip_or_collect(new /obj/item/clothing/mask/gas/clown_hat(H), slot_wear_mask)
H.equip_or_collect(new /obj/item/weapon/reagent_containers/food/snacks/grown/banana(H), slot_in_backpack)
H.equip_or_collect(new /obj/item/weapon/bikehorn(H), slot_in_backpack)
H.equip_or_collect(new /obj/item/weapon/stamp/clown(H), slot_in_backpack)
H.equip_or_collect(new /obj/item/toy/crayon/rainbow(H), slot_in_backpack)
H.equip_or_collect(new /obj/item/weapon/storage/fancy/crayons(H), slot_in_backpack)
H.equip_or_collect(new /obj/item/toy/waterflower(H), slot_in_backpack)
H.mutations.Add(CLUMSY)
return 1
@@ -244,23 +244,23 @@
equip(var/mob/living/carbon/human/H)
if(!H) return 0
if(H.backbag == 2) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack(H), slot_back)
if(H.backbag == 3) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
H.equip_to_slot_or_drop(new /obj/item/clothing/under/mime(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/clothing/shoes/black(H), slot_shoes)
H.equip_to_slot_or_drop(new /obj/item/device/pda/mime(H), slot_belt)
H.equip_to_slot_or_drop(new /obj/item/clothing/gloves/white(H), slot_gloves)
H.equip_to_slot_or_drop(new /obj/item/clothing/mask/gas/mime(H), slot_wear_mask)
H.equip_to_slot_or_drop(new /obj/item/clothing/head/beret(H), slot_head)
H.equip_to_slot_or_drop(new /obj/item/clothing/suit/suspenders(H), slot_wear_suit)
if(H.backbag == 2) H.equip_or_collect(new /obj/item/weapon/storage/backpack(H), slot_back)
if(H.backbag == 3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
H.equip_or_collect(new /obj/item/clothing/under/mime(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes)
H.equip_or_collect(new /obj/item/device/pda/mime(H), slot_belt)
H.equip_or_collect(new /obj/item/clothing/gloves/white(H), slot_gloves)
H.equip_or_collect(new /obj/item/clothing/mask/gas/mime(H), slot_wear_mask)
H.equip_or_collect(new /obj/item/clothing/head/beret(H), slot_head)
H.equip_or_collect(new /obj/item/clothing/suit/suspenders(H), slot_wear_suit)
if(H.backbag == 1)
H.equip_to_slot_or_drop(new H.species.survival_gear(H), slot_r_hand)
H.equip_to_slot_or_drop(new /obj/item/toy/crayon/mime(H), slot_l_store)
H.equip_to_slot_or_drop(new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(H), slot_l_hand)
H.equip_or_collect(new H.species.survival_gear(H), slot_r_hand)
H.equip_or_collect(new /obj/item/toy/crayon/mime(H), slot_l_store)
H.equip_or_collect(new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(H), slot_l_hand)
else
H.equip_to_slot_or_drop(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_to_slot_or_drop(new /obj/item/toy/crayon/mime(H), slot_in_backpack)
H.equip_to_slot_or_drop(new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(H), slot_in_backpack)
H.equip_or_collect(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_or_collect(new /obj/item/toy/crayon/mime(H), slot_in_backpack)
H.equip_or_collect(new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(H), slot_in_backpack)
H.verbs += /client/proc/mimespeak
H.verbs += /client/proc/mimewall
H.mind.special_verbs += /client/proc/mimespeak
@@ -285,14 +285,14 @@
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/janitor(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/clothing/shoes/black(H), slot_shoes)
H.equip_to_slot_or_drop(new /obj/item/device/pda/janitor(H), slot_belt)
H.equip_or_collect(new /obj/item/clothing/under/rank/janitor(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes)
H.equip_or_collect(new /obj/item/device/pda/janitor(H), slot_belt)
if(H.backbag == 1)
H.equip_to_slot_or_drop(new H.species.survival_gear(H), slot_r_hand)
H.equip_or_collect(new H.species.survival_gear(H), slot_r_hand)
else
H.equip_to_slot_or_drop(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_to_slot_or_drop(new /obj/item/key(H), slot_l_store)
H.equip_or_collect(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_or_collect(new /obj/item/key(H), slot_l_store)
return 1
@@ -314,14 +314,14 @@
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_to_slot_or_drop(new /obj/item/clothing/under/suit_jacket/red(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/device/pda/librarian(H), slot_belt)
H.equip_to_slot_or_drop(new /obj/item/clothing/shoes/black(H), slot_shoes)
H.equip_to_slot_or_drop(new /obj/item/weapon/barcodescanner(H), slot_l_hand)
H.equip_or_collect(new /obj/item/clothing/under/suit_jacket/red(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/device/pda/librarian(H), slot_belt)
H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes)
H.equip_or_collect(new /obj/item/weapon/barcodescanner(H), slot_l_hand)
if(H.backbag == 1)
H.equip_to_slot_or_drop(new H.species.survival_gear(H), slot_r_hand)
H.equip_or_collect(new H.species.survival_gear(H), slot_r_hand)
else
H.equip_to_slot_or_drop(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_or_collect(new H.species.survival_gear(H.back), slot_in_backpack)
return 1
@@ -343,19 +343,19 @@
equip(var/mob/living/carbon/human/H)
if(!H) return 0
switch(H.backbag)
if(2) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack(H), slot_back)
if(3) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
if(4) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/internalaffairs(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/clothing/suit/storage/internalaffairs(H), slot_wear_suit)
H.equip_to_slot_or_drop(new /obj/item/clothing/shoes/brown(H), slot_shoes)
H.equip_to_slot_or_drop(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses)
H.equip_to_slot_or_drop(new /obj/item/device/pda/lawyer(H), slot_belt)
H.equip_to_slot_or_drop(new /obj/item/weapon/storage/briefcase(H), slot_l_hand)
if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack(H), slot_back)
if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_or_collect(new /obj/item/clothing/under/rank/internalaffairs(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/suit/storage/internalaffairs(H), slot_wear_suit)
H.equip_or_collect(new /obj/item/clothing/shoes/brown(H), slot_shoes)
H.equip_or_collect(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses)
H.equip_or_collect(new /obj/item/device/pda/lawyer(H), slot_belt)
H.equip_or_collect(new /obj/item/weapon/storage/briefcase(H), slot_l_hand)
if(H.backbag == 1)
H.equip_to_slot_or_drop(new H.species.survival_gear(H), slot_r_hand)
H.equip_or_collect(new H.species.survival_gear(H), slot_r_hand)
else
H.equip_to_slot_or_drop(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_or_collect(new H.species.survival_gear(H.back), slot_in_backpack)
var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
L.imp_in = H
L.implanted = 1

12
code/game/jobs/job/civilian_chaplain.dm
View File

@@ -17,14 +17,14 @@
if(!H) return 0
var/obj/item/weapon/storage/bible/B = new /obj/item/weapon/storage/bible(H) //BS12 EDIT
H.equip_to_slot_or_drop(B, slot_l_hand)
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/chaplain(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/device/pda/chaplain(H), slot_belt)
H.equip_to_slot_or_drop(new /obj/item/clothing/shoes/black(H), slot_shoes)
H.equip_or_collect(B, slot_l_hand)
H.equip_or_collect(new /obj/item/clothing/under/rank/chaplain(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/device/pda/chaplain(H), slot_belt)
H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes)
if(H.backbag == 1)
H.equip_to_slot_or_drop(new H.species.survival_gear(H), slot_r_hand)
H.equip_or_collect(new H.species.survival_gear(H), slot_r_hand)
else
H.equip_to_slot_or_drop(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_or_collect(new H.species.survival_gear(H.back), slot_in_backpack)
spawn(0)
var/religion_name = "Christianity"
var/new_religion = copytext(sanitize(input(H, "You are the crew services officer. Would you like to change your religion? Default is Christianity, in SPACE.", "Name change", religion_name)),1,MAX_NAME_LEN)

68
code/game/jobs/job/engineering.dm
View File

@@ -22,21 +22,21 @@
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_to_slot_or_drop(new /obj/item/device/radio/headset/heads/ce(H), slot_l_ear)
H.equip_or_collect(new /obj/item/device/radio/headset/heads/ce(H), slot_l_ear)
switch(H.backbag)
if(2) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/industrial(H), slot_back)
if(3) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel_eng(H), slot_back)
if(4) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/chief_engineer(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/device/pda/heads/ce(H), slot_l_store)
H.equip_to_slot_or_drop(new /obj/item/clothing/shoes/brown(H), slot_shoes)
H.equip_to_slot_or_drop(new /obj/item/clothing/head/hardhat/white(H), slot_head)
H.equip_to_slot_or_drop(new /obj/item/weapon/storage/belt/utility/full(H), slot_belt)
H.equip_to_slot_or_drop(new /obj/item/clothing/gloves/black(H), slot_gloves)
if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack/industrial(H), slot_back)
if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_eng(H), slot_back)
if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_or_collect(new /obj/item/clothing/under/rank/chief_engineer(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/device/pda/heads/ce(H), slot_l_store)
H.equip_or_collect(new /obj/item/clothing/shoes/brown(H), slot_shoes)
H.equip_or_collect(new /obj/item/clothing/head/hardhat/white(H), slot_head)
H.equip_or_collect(new /obj/item/weapon/storage/belt/utility/full(H), slot_belt)
H.equip_or_collect(new /obj/item/clothing/gloves/black(H), slot_gloves)
if(H.backbag == 1)
H.equip_to_slot_or_drop(new /obj/item/weapon/storage/box/engineer(H), slot_r_hand)
H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H), slot_r_hand)
else
H.equip_to_slot_or_drop(new /obj/item/weapon/storage/box/engineer(H.back), slot_in_backpack)
H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H.back), slot_in_backpack)
return 1
@@ -57,21 +57,21 @@
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_to_slot_or_drop(new /obj/item/device/radio/headset/headset_eng(H), slot_l_ear)
H.equip_or_collect(new /obj/item/device/radio/headset/headset_eng(H), slot_l_ear)
switch(H.backbag)
if(2) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/industrial(H), slot_back)
if(3) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel_eng(H), slot_back)
if(4) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/engineer(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/clothing/shoes/orange(H), slot_shoes)
H.equip_to_slot_or_drop(new /obj/item/weapon/storage/belt/utility/full(H), slot_belt)
H.equip_to_slot_or_drop(new /obj/item/clothing/head/hardhat(H), slot_head)
H.equip_to_slot_or_drop(new /obj/item/device/t_scanner(H), slot_r_store)
H.equip_to_slot_or_drop(new /obj/item/device/pda/engineering(H), slot_l_store)
if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack/industrial(H), slot_back)
if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_eng(H), slot_back)
if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_or_collect(new /obj/item/clothing/under/rank/engineer(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/shoes/orange(H), slot_shoes)
H.equip_or_collect(new /obj/item/weapon/storage/belt/utility/full(H), slot_belt)
H.equip_or_collect(new /obj/item/clothing/head/hardhat(H), slot_head)
H.equip_or_collect(new /obj/item/device/t_scanner(H), slot_r_store)
H.equip_or_collect(new /obj/item/device/pda/engineering(H), slot_l_store)
if(H.backbag == 1)
H.equip_to_slot_or_drop(new /obj/item/weapon/storage/box/engineer(H), slot_r_hand)
H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H), slot_r_hand)
else
H.equip_to_slot_or_drop(new /obj/item/weapon/storage/box/engineer(H.back), slot_in_backpack)
H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H.back), slot_in_backpack)
return 1
@@ -91,17 +91,17 @@
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_to_slot_or_drop(new /obj/item/device/radio/headset/headset_eng(H), slot_l_ear)
H.equip_or_collect(new /obj/item/device/radio/headset/headset_eng(H), slot_l_ear)
switch(H.backbag)
if(2) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack(H), slot_back)
if(3) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
if(4) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/atmospheric_technician(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/clothing/shoes/black(H), slot_shoes)
H.equip_to_slot_or_drop(new /obj/item/device/pda/atmos(H), slot_l_store)
H.equip_to_slot_or_drop(new /obj/item/weapon/storage/belt/utility/atmostech/(H), slot_belt)
if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack(H), slot_back)
if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_or_collect(new /obj/item/clothing/under/rank/atmospheric_technician(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes)
H.equip_or_collect(new /obj/item/device/pda/atmos(H), slot_l_store)
H.equip_or_collect(new /obj/item/weapon/storage/belt/utility/atmostech/(H), slot_belt)
if(H.backbag == 1)
H.equip_to_slot_or_drop(new /obj/item/weapon/storage/box/engineer(H), slot_r_hand)
H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H), slot_r_hand)
else
H.equip_to_slot_or_drop(new /obj/item/weapon/storage/box/engineer(H.back), slot_in_backpack)
H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H.back), slot_in_backpack)
return 1

152
code/game/jobs/job/medical.dm
View File

@@ -19,21 +19,21 @@
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_to_slot_or_drop(new /obj/item/device/radio/headset/heads/cmo(H), slot_l_ear)
H.equip_or_collect(new /obj/item/device/radio/headset/heads/cmo(H), slot_l_ear)
switch(H.backbag)
if(2) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/medic(H), slot_back)
if(3) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel_med(H), slot_back)
if(4) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/chief_medical_officer(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/clothing/shoes/brown(H), slot_shoes)
H.equip_to_slot_or_drop(new /obj/item/device/pda/heads/cmo(H), slot_belt)
H.equip_to_slot_or_drop(new /obj/item/clothing/suit/storage/labcoat/cmo(H), slot_wear_suit)
H.equip_to_slot_or_drop(new /obj/item/weapon/storage/firstaid/regular(H), slot_l_hand)
H.equip_to_slot_or_drop(new /obj/item/device/flashlight/pen(H), slot_s_store)
if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack/medic(H), slot_back)
if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_med(H), slot_back)
if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_or_collect(new /obj/item/clothing/under/rank/chief_medical_officer(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/shoes/brown(H), slot_shoes)
H.equip_or_collect(new /obj/item/device/pda/heads/cmo(H), slot_belt)
H.equip_or_collect(new /obj/item/clothing/suit/storage/labcoat/cmo(H), slot_wear_suit)
H.equip_or_collect(new /obj/item/weapon/storage/firstaid/regular(H), slot_l_hand)
H.equip_or_collect(new /obj/item/device/flashlight/pen(H), slot_s_store)
if(H.backbag == 1)
H.equip_to_slot_or_drop(new H.species.survival_gear(H), slot_r_hand)
H.equip_or_collect(new H.species.survival_gear(H), slot_r_hand)
else
H.equip_to_slot_or_drop(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_or_collect(new H.species.survival_gear(H.back), slot_in_backpack)
return 1
@@ -53,47 +53,47 @@
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_to_slot_or_drop(new /obj/item/device/radio/headset/headset_med(H), slot_l_ear)
H.equip_or_collect(new /obj/item/device/radio/headset/headset_med(H), slot_l_ear)
switch(H.backbag)
if(2) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/medic(H), slot_back)
if(3) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel_med(H), slot_back)
if(4) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack/medic(H), slot_back)
if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_med(H), slot_back)
if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
if (H.mind.role_alt_title)
switch(H.mind.role_alt_title)
if("Emergency Physician")
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/clothing/suit/storage/fr_jacket(H), slot_wear_suit)
H.equip_or_collect(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/suit/storage/fr_jacket(H), slot_wear_suit)
if("Surgeon")
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/medical/blue(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit)
H.equip_to_slot_or_drop(new /obj/item/clothing/head/surgery/blue(H), slot_head)
H.equip_or_collect(new /obj/item/clothing/under/rank/medical/blue(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit)
H.equip_or_collect(new /obj/item/clothing/head/surgery/blue(H), slot_head)
if("Virologist")
H.equip_to_slot_or_drop(new /obj/item/clothing/suit/storage/labcoat/virologist(H), slot_wear_suit)
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/virologist(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/clothing/mask/surgical(H), slot_wear_mask)
H.equip_or_collect(new /obj/item/clothing/suit/storage/labcoat/virologist(H), slot_wear_suit)
H.equip_or_collect(new /obj/item/clothing/under/rank/virologist(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/mask/surgical(H), slot_wear_mask)
if("Medical Doctor")
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit)
H.equip_or_collect(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit)
if("Nurse")
if(H.gender == FEMALE)
if(prob(50))
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/nursesuit(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/under/rank/nursesuit(H), slot_w_uniform)
else
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/nurse(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/clothing/head/nursehat(H), slot_head)
H.equip_or_collect(new /obj/item/clothing/under/rank/nurse(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/head/nursehat(H), slot_head)
else
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/medical/purple(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/under/rank/medical/purple(H), slot_w_uniform)
else
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit)
H.equip_to_slot_or_drop(new /obj/item/clothing/shoes/white(H), slot_shoes)
H.equip_to_slot_or_drop(new /obj/item/device/pda/medical(H), slot_belt)
H.equip_to_slot_or_drop(new /obj/item/weapon/storage/firstaid/regular(H), slot_l_hand)
H.equip_to_slot_or_drop(new /obj/item/device/flashlight/pen(H), slot_s_store)
H.equip_or_collect(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit)
H.equip_or_collect(new /obj/item/clothing/shoes/white(H), slot_shoes)
H.equip_or_collect(new /obj/item/device/pda/medical(H), slot_belt)
H.equip_or_collect(new /obj/item/weapon/storage/firstaid/regular(H), slot_l_hand)
H.equip_or_collect(new /obj/item/device/flashlight/pen(H), slot_s_store)
if(H.backbag == 1)
H.equip_to_slot_or_drop(new H.species.survival_gear(H), slot_r_hand)
H.equip_or_collect(new H.species.survival_gear(H), slot_r_hand)
else
H.equip_to_slot_or_drop(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_or_collect(new H.species.survival_gear(H.back), slot_in_backpack)
return 1
@@ -115,15 +115,15 @@
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_to_slot_or_drop(new /obj/item/device/radio/headset/headset_med(H), slot_l_ear)
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/chemist(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/clothing/shoes/white(H), slot_shoes)
H.equip_to_slot_or_drop(new /obj/item/device/pda/chemist(H), slot_belt)
H.equip_to_slot_or_drop(new /obj/item/clothing/suit/storage/labcoat/chemist(H), slot_wear_suit)
H.equip_or_collect(new /obj/item/device/radio/headset/headset_med(H), slot_l_ear)
H.equip_or_collect(new /obj/item/clothing/under/rank/chemist(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/shoes/white(H), slot_shoes)
H.equip_or_collect(new /obj/item/device/pda/chemist(H), slot_belt)
H.equip_or_collect(new /obj/item/clothing/suit/storage/labcoat/chemist(H), slot_wear_suit)
if(H.backbag == 1)
H.equip_to_slot_or_drop(new H.species.survival_gear(H), slot_r_hand)
H.equip_or_collect(new H.species.survival_gear(H), slot_r_hand)
else
H.equip_to_slot_or_drop(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_or_collect(new H.species.survival_gear(H.back), slot_in_backpack)
return 1
@@ -143,16 +143,16 @@
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_to_slot_or_drop(new /obj/item/device/radio/headset/headset_medsci(H), slot_l_ear)
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/geneticist(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/clothing/shoes/white(H), slot_shoes)
H.equip_to_slot_or_drop(new /obj/item/device/pda/geneticist(H), slot_belt)
H.equip_to_slot_or_drop(new /obj/item/clothing/suit/storage/labcoat/genetics(H), slot_wear_suit)
H.equip_to_slot_or_drop(new /obj/item/device/flashlight/pen(H), slot_s_store)
H.equip_or_collect(new /obj/item/device/radio/headset/headset_medsci(H), slot_l_ear)
H.equip_or_collect(new /obj/item/clothing/under/rank/geneticist(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/shoes/white(H), slot_shoes)
H.equip_or_collect(new /obj/item/device/pda/geneticist(H), slot_belt)
H.equip_or_collect(new /obj/item/clothing/suit/storage/labcoat/genetics(H), slot_wear_suit)
H.equip_or_collect(new /obj/item/device/flashlight/pen(H), slot_s_store)
if(H.backbag == 1)
H.equip_to_slot_or_drop(new H.species.survival_gear(H), slot_r_hand)
H.equip_or_collect(new H.species.survival_gear(H), slot_r_hand)
else
H.equip_to_slot_or_drop(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_or_collect(new H.species.survival_gear(H.back), slot_in_backpack)
return 1
/*/datum/job/virologist
@@ -171,21 +171,21 @@
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_to_slot_or_drop(new /obj/item/device/radio/headset/headset_med(H), slot_l_ear)
H.equip_or_collect(new /obj/item/device/radio/headset/headset_med(H), slot_l_ear)
switch(H.backbag)
if(2) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/medic(H), slot_back)
if(3) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel_med(H), slot_back)
if(4) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/virologist(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/device/pda/viro(H), slot_belt)
H.equip_to_slot_or_drop(new /obj/item/clothing/mask/surgical(H), slot_wear_mask)
H.equip_to_slot_or_drop(new /obj/item/clothing/shoes/white(H), slot_shoes)
H.equip_to_slot_or_drop(new /obj/item/clothing/suit/storage/labcoat/virologist(H), slot_wear_suit)
H.equip_to_slot_or_drop(new /obj/item/device/flashlight/pen(H), slot_s_store)
if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack/medic(H), slot_back)
if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_med(H), slot_back)
if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_or_collect(new /obj/item/clothing/under/rank/virologist(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/device/pda/viro(H), slot_belt)
H.equip_or_collect(new /obj/item/clothing/mask/surgical(H), slot_wear_mask)
H.equip_or_collect(new /obj/item/clothing/shoes/white(H), slot_shoes)
H.equip_or_collect(new /obj/item/clothing/suit/storage/labcoat/virologist(H), slot_wear_suit)
H.equip_or_collect(new /obj/item/device/flashlight/pen(H), slot_s_store)
if(H.backbag == 1)
H.equip_to_slot_or_drop(new H.species.survival_gear(H), slot_r_hand)
H.equip_or_collect(new H.species.survival_gear(H), slot_r_hand)
else
H.equip_to_slot_or_drop(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_or_collect(new H.species.survival_gear(H.back), slot_in_backpack)
return 1
/datum/job/psychiatrist
@@ -204,18 +204,18 @@
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_to_slot_or_drop(new /obj/item/device/radio/headset/headset_med(H), slot_l_ear)
H.equip_or_collect(new /obj/item/device/radio/headset/headset_med(H), slot_l_ear)
switch(H.backbag)
if(2) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/medic(H), slot_back)
if(3) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel_med(H), slot_back)
if(4) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/device/pda/medical(H), slot_belt)
H.equip_to_slot_or_drop(new /obj/item/clothing/shoes/white(H), slot_shoes)
H.equip_to_slot_or_drop(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit)
H.equip_to_slot_or_drop(new /obj/item/device/flashlight/pen(H), slot_s_store)
if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack/medic(H), slot_back)
if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_med(H), slot_back)
if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_or_collect(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/device/pda/medical(H), slot_belt)
H.equip_or_collect(new /obj/item/clothing/shoes/white(H), slot_shoes)
H.equip_or_collect(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit)
H.equip_or_collect(new /obj/item/device/flashlight/pen(H), slot_s_store)
if(H.backbag == 1)
H.equip_to_slot_or_drop(new H.species.survival_gear(H), slot_r_hand)
H.equip_or_collect(new H.species.survival_gear(H), slot_r_hand)
else
H.equip_to_slot_or_drop(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_or_collect(new H.species.survival_gear(H.back), slot_in_backpack)
return 1

26
code/game/jobs/job/paramedic.dm
View File

@@ -12,19 +12,19 @@
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_to_slot_or_drop(new /obj/item/device/radio/headset/headset_med(H), slot_l_ear)
if(H.backbag == 2) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/medic (H), slot_back)
if(H.backbag == 3) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel_med(H), slot_back)
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/medical/paramedic(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/clothing/shoes/black(H), slot_shoes)
H.equip_to_slot_or_drop(new /obj/item/device/pda/medical(H), slot_belt)
H.equip_to_slot_or_drop(new /obj/item/clothing/mask/cigarette(H), slot_wear_mask)
H.equip_to_slot_or_drop(new /obj/item/clothing/head/soft/paramedic(H), slot_head)
H.equip_to_slot_or_drop(new /obj/item/device/flashlight/pen(H), slot_s_store)
H.equip_or_collect(new /obj/item/device/radio/headset/headset_med(H), slot_l_ear)
if(H.backbag == 2) H.equip_or_collect(new /obj/item/weapon/storage/backpack/medic (H), slot_back)
if(H.backbag == 3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_med(H), slot_back)
H.equip_or_collect(new /obj/item/clothing/under/rank/medical/paramedic(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes)
H.equip_or_collect(new /obj/item/device/pda/medical(H), slot_belt)
H.equip_or_collect(new /obj/item/clothing/mask/cigarette(H), slot_wear_mask)
H.equip_or_collect(new /obj/item/clothing/head/soft/paramedic(H), slot_head)
H.equip_or_collect(new /obj/item/device/flashlight/pen(H), slot_s_store)
if(H.backbag == 1)
H.equip_to_slot_or_drop(new /obj/item/weapon/storage/box/engineer(H), slot_r_hand)
H.equip_to_slot_or_drop(new /obj/item/device/healthanalyzer(H), slot_l_hand)
H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H), slot_r_hand)
H.equip_or_collect(new /obj/item/device/healthanalyzer(H), slot_l_hand)
else
H.equip_to_slot_or_drop(new /obj/item/weapon/storage/box/engineer(H.back), slot_in_backpack)
H.equip_to_slot_or_drop(new /obj/item/device/healthanalyzer(H.back), slot_in_backpack)
H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H.back), slot_in_backpack)
H.equip_or_collect(new /obj/item/device/healthanalyzer(H.back), slot_in_backpack)
return 1

52
code/game/jobs/job/science.dm
View File

@@ -26,16 +26,16 @@
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_to_slot_or_drop(new /obj/item/device/radio/headset/heads/rd(H), slot_l_ear)
H.equip_to_slot_or_drop(new /obj/item/clothing/shoes/brown(H), slot_shoes)
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/research_director(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/device/pda/heads/rd(H), slot_belt)
H.equip_to_slot_or_drop(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit)
H.equip_to_slot_or_drop(new /obj/item/weapon/clipboard(H), slot_l_hand)
H.equip_or_collect(new /obj/item/device/radio/headset/heads/rd(H), slot_l_ear)
H.equip_or_collect(new /obj/item/clothing/shoes/brown(H), slot_shoes)
H.equip_or_collect(new /obj/item/clothing/under/rank/research_director(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/device/pda/heads/rd(H), slot_belt)
H.equip_or_collect(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit)
H.equip_or_collect(new /obj/item/weapon/clipboard(H), slot_l_hand)
if(H.backbag == 1)
H.equip_to_slot_or_drop(new H.species.survival_gear(H), slot_r_hand)
H.equip_or_collect(new H.species.survival_gear(H), slot_r_hand)
else
H.equip_to_slot_or_drop(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_or_collect(new H.species.survival_gear(H.back), slot_in_backpack)
return 1
@@ -60,15 +60,15 @@
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_to_slot_or_drop(new /obj/item/device/radio/headset/headset_sci(H), slot_l_ear)
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/scientist(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/clothing/shoes/white(H), slot_shoes)
H.equip_to_slot_or_drop(new /obj/item/device/pda/toxins(H), slot_belt)
H.equip_to_slot_or_drop(new /obj/item/clothing/suit/storage/labcoat/science(H), slot_wear_suit)
H.equip_or_collect(new /obj/item/device/radio/headset/headset_sci(H), slot_l_ear)
H.equip_or_collect(new /obj/item/clothing/under/rank/scientist(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/shoes/white(H), slot_shoes)
H.equip_or_collect(new /obj/item/device/pda/toxins(H), slot_belt)
H.equip_or_collect(new /obj/item/clothing/suit/storage/labcoat/science(H), slot_wear_suit)
if(H.backbag == 1)
H.equip_to_slot_or_drop(new H.species.survival_gear(H), slot_r_hand)
H.equip_or_collect(new H.species.survival_gear(H), slot_r_hand)
else
H.equip_to_slot_or_drop(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_or_collect(new H.species.survival_gear(H.back), slot_in_backpack)
return 1
@@ -93,17 +93,17 @@
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_to_slot_or_drop(new /obj/item/device/radio/headset/headset_sci(H), slot_l_ear)
if(H.backbag == 2) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack(H), slot_back)
if(H.backbag == 3) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/roboticist(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/clothing/shoes/black(H), slot_shoes)
H.equip_to_slot_or_drop(new /obj/item/device/pda/roboticist(H), slot_belt)
H.equip_to_slot_or_drop(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit)
// H.equip_to_slot_or_drop(new /obj/item/clothing/gloves/black(H), slot_gloves)
H.equip_to_slot_or_drop(new /obj/item/weapon/storage/toolbox/mechanical(H), slot_l_hand)
H.equip_or_collect(new /obj/item/device/radio/headset/headset_sci(H), slot_l_ear)
if(H.backbag == 2) H.equip_or_collect(new /obj/item/weapon/storage/backpack(H), slot_back)
if(H.backbag == 3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
H.equip_or_collect(new /obj/item/clothing/under/rank/roboticist(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes)
H.equip_or_collect(new /obj/item/device/pda/roboticist(H), slot_belt)
H.equip_or_collect(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit)
// H.equip_or_collect(new /obj/item/clothing/gloves/black(H), slot_gloves)
H.equip_or_collect(new /obj/item/weapon/storage/toolbox/mechanical(H), slot_l_hand)
if(H.backbag == 1)
H.equip_to_slot_or_drop(new H.species.survival_gear(H), slot_r_hand)
H.equip_or_collect(new H.species.survival_gear(H), slot_r_hand)
else
H.equip_to_slot_or_drop(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_or_collect(new H.species.survival_gear(H.back), slot_in_backpack)
return 1

124
code/game/jobs/job/security.dm
View File

@@ -22,23 +22,23 @@
equip(var/mob/living/carbon/human/H)
if(!H) return 0
switch(H.backbag)
if(2) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/security(H), slot_back)
if(3) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel_sec(H), slot_back)
if(4) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_to_slot_or_drop(new /obj/item/device/radio/headset/heads/hos(H), slot_l_ear)
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/head_of_security(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/clothing/shoes/jackboots(H), slot_shoes)
H.equip_to_slot_or_drop(new /obj/item/device/pda/heads/hos(H), slot_belt)
H.equip_to_slot_or_drop(new /obj/item/clothing/gloves/black(H), slot_gloves)
// H.equip_to_slot_or_drop(new /obj/item/clothing/mask/gas(H), slot_wear_mask) //Grab one from the armory you donk
H.equip_to_slot_or_drop(new /obj/item/clothing/glasses/sunglasses/sechud(H), slot_glasses)
H.equip_to_slot_or_drop(new /obj/item/weapon/gun/energy/gun(H), slot_s_store)
if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack/security(H), slot_back)
if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_sec(H), slot_back)
if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_or_collect(new /obj/item/device/radio/headset/heads/hos(H), slot_l_ear)
H.equip_or_collect(new /obj/item/clothing/under/rank/head_of_security(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/shoes/jackboots(H), slot_shoes)
H.equip_or_collect(new /obj/item/device/pda/heads/hos(H), slot_belt)
H.equip_or_collect(new /obj/item/clothing/gloves/black(H), slot_gloves)
// H.equip_or_collect(new /obj/item/clothing/mask/gas(H), slot_wear_mask) //Grab one from the armory you donk
H.equip_or_collect(new /obj/item/clothing/glasses/sunglasses/sechud(H), slot_glasses)
H.equip_or_collect(new /obj/item/weapon/gun/energy/gun(H), slot_s_store)
if(H.backbag == 1)
H.equip_to_slot_or_drop(new H.species.survival_gear(H), slot_r_hand)
H.equip_to_slot_or_drop(new /obj/item/weapon/handcuffs(H), slot_l_store)
H.equip_or_collect(new H.species.survival_gear(H), slot_r_hand)
H.equip_or_collect(new /obj/item/weapon/handcuffs(H), slot_l_store)
else
H.equip_to_slot_or_drop(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_to_slot_or_drop(new /obj/item/weapon/handcuffs(H), slot_in_backpack)
H.equip_or_collect(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_or_collect(new /obj/item/weapon/handcuffs(H), slot_in_backpack)
var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
L.imp_in = H
L.implanted = 1
@@ -61,24 +61,24 @@
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_to_slot_or_drop(new /obj/item/device/radio/headset/headset_sec(H), slot_l_ear)
H.equip_or_collect(new /obj/item/device/radio/headset/headset_sec(H), slot_l_ear)
switch(H.backbag)
if(2) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/security(H), slot_back)
if(3) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel_sec(H), slot_back)
if(4) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/warden(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/clothing/shoes/jackboots(H), slot_shoes)
H.equip_to_slot_or_drop(new /obj/item/device/pda/warden(H), slot_belt)
H.equip_to_slot_or_drop(new /obj/item/clothing/gloves/black(H), slot_gloves)
H.equip_to_slot_or_drop(new /obj/item/clothing/glasses/sunglasses/sechud(H), slot_glasses)
// H.equip_to_slot_or_drop(new /obj/item/clothing/mask/gas(H), slot_wear_mask) //Grab one from the armory you donk
H.equip_to_slot_or_drop(new /obj/item/device/flash(H), slot_l_store)
if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack/security(H), slot_back)
if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_sec(H), slot_back)
if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_or_collect(new /obj/item/clothing/under/rank/warden(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/shoes/jackboots(H), slot_shoes)
H.equip_or_collect(new /obj/item/device/pda/warden(H), slot_belt)
H.equip_or_collect(new /obj/item/clothing/gloves/black(H), slot_gloves)
H.equip_or_collect(new /obj/item/clothing/glasses/sunglasses/sechud(H), slot_glasses)
// H.equip_or_collect(new /obj/item/clothing/mask/gas(H), slot_wear_mask) //Grab one from the armory you donk
H.equip_or_collect(new /obj/item/device/flash(H), slot_l_store)
if(H.backbag == 1)
H.equip_to_slot_or_drop(new H.species.survival_gear(H), slot_r_hand)
H.equip_to_slot_or_drop(new /obj/item/weapon/handcuffs(H), slot_l_hand)
H.equip_or_collect(new H.species.survival_gear(H), slot_r_hand)
H.equip_or_collect(new /obj/item/weapon/handcuffs(H), slot_l_hand)
else
H.equip_to_slot_or_drop(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_to_slot_or_drop(new /obj/item/weapon/handcuffs(H), slot_in_backpack)
H.equip_or_collect(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_or_collect(new /obj/item/weapon/handcuffs(H), slot_in_backpack)
var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
L.imp_in = H
L.implanted = 1
@@ -103,33 +103,33 @@
minimal_player_age = 7
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_to_slot_or_drop(new /obj/item/device/radio/headset/headset_sec(H), slot_l_ear)
H.equip_or_collect(new /obj/item/device/radio/headset/headset_sec(H), slot_l_ear)
switch(H.backbag)
if(2) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack(H), slot_back)
if(3) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
if(4) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_to_slot_or_drop(new /obj/item/clothing/under/det(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/clothing/shoes/brown(H), slot_shoes)
H.equip_to_slot_or_drop(new /obj/item/device/pda/detective(H), slot_belt)
if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack(H), slot_back)
if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_or_collect(new /obj/item/clothing/under/det(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/shoes/brown(H), slot_shoes)
H.equip_or_collect(new /obj/item/device/pda/detective(H), slot_belt)
/* var/obj/item/clothing/mask/cigarette/CIG = new /obj/item/clothing/mask/cigarette(H)
CIG.light("")
H.equip_to_slot_or_drop(CIG, slot_wear_mask) */
H.equip_to_slot_or_drop(new /obj/item/clothing/gloves/black(H), slot_gloves)
H.equip_or_collect(CIG, slot_wear_mask) */
H.equip_or_collect(new /obj/item/clothing/gloves/black(H), slot_gloves)
if(H.mind.role_alt_title && H.mind.role_alt_title == "Forensic Technician")
H.equip_to_slot_or_drop(new /obj/item/clothing/suit/storage/forensics/blue(H), slot_wear_suit)
H.equip_or_collect(new /obj/item/clothing/suit/storage/forensics/blue(H), slot_wear_suit)
else
H.equip_to_slot_or_drop(new /obj/item/clothing/suit/storage/det_suit(H), slot_wear_suit)
H.equip_to_slot_or_drop(new /obj/item/clothing/head/det_hat(H), slot_head)
H.equip_to_slot_or_drop(new /obj/item/weapon/lighter/zippo(H), slot_l_store)
H.equip_or_collect(new /obj/item/clothing/suit/storage/det_suit(H), slot_wear_suit)
H.equip_or_collect(new /obj/item/clothing/head/det_hat(H), slot_head)
H.equip_or_collect(new /obj/item/weapon/lighter/zippo(H), slot_l_store)
if(H.backbag == 1)//Why cant some of these things spawn in his office?
H.equip_to_slot_or_drop(new H.species.survival_gear(H), slot_r_hand)
H.equip_to_slot_or_drop(new /obj/item/weapon/storage/box/evidence(H), slot_l_hand)
H.equip_to_slot_or_drop(new /obj/item/device/detective_scanner(H), slot_r_store)
H.equip_or_collect(new H.species.survival_gear(H), slot_r_hand)
H.equip_or_collect(new /obj/item/weapon/storage/box/evidence(H), slot_l_hand)
H.equip_or_collect(new /obj/item/device/detective_scanner(H), slot_r_store)
else
H.equip_to_slot_or_drop(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_to_slot_or_drop(new /obj/item/weapon/storage/box/evidence(H), slot_in_backpack)
H.equip_to_slot_or_drop(new /obj/item/device/detective_scanner(H), slot_in_backpack)
H.equip_or_collect(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_or_collect(new /obj/item/weapon/storage/box/evidence(H), slot_in_backpack)
H.equip_or_collect(new /obj/item/device/detective_scanner(H), slot_in_backpack)
var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
L.imp_in = H
L.implanted = 1
@@ -151,22 +151,22 @@
minimal_player_age = 7
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_to_slot_or_drop(new /obj/item/device/radio/headset/headset_sec(H), slot_l_ear)
H.equip_or_collect(new /obj/item/device/radio/headset/headset_sec(H), slot_l_ear)
switch(H.backbag)
if(2) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/security(H), slot_back)
if(3) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel_sec(H), slot_back)
if(4) H.equip_to_slot_or_drop(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_to_slot_or_drop(new /obj/item/clothing/under/rank/security(H), slot_w_uniform)
H.equip_to_slot_or_drop(new /obj/item/clothing/shoes/jackboots(H), slot_shoes)
H.equip_to_slot_or_drop(new /obj/item/device/pda/security(H), slot_belt)
H.equip_to_slot_or_drop(new /obj/item/weapon/handcuffs(H), slot_s_store)
H.equip_to_slot_or_drop(new /obj/item/device/flash(H), slot_l_store)
if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack/security(H), slot_back)
if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_sec(H), slot_back)
if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_or_collect(new /obj/item/clothing/under/rank/security(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/shoes/jackboots(H), slot_shoes)
H.equip_or_collect(new /obj/item/device/pda/security(H), slot_belt)
H.equip_or_collect(new /obj/item/weapon/handcuffs(H), slot_s_store)
H.equip_or_collect(new /obj/item/device/flash(H), slot_l_store)
if(H.backbag == 1)
H.equip_to_slot_or_drop(new H.species.survival_gear(H), slot_r_hand)
H.equip_to_slot_or_drop(new /obj/item/weapon/handcuffs(H), slot_l_hand)
H.equip_or_collect(new H.species.survival_gear(H), slot_r_hand)
H.equip_or_collect(new /obj/item/weapon/handcuffs(H), slot_l_hand)
else
H.equip_to_slot_or_drop(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_to_slot_or_drop(new /obj/item/weapon/handcuffs(H), slot_in_backpack)
H.equip_or_collect(new H.species.survival_gear(H.back), slot_in_backpack)
H.equip_or_collect(new /obj/item/weapon/handcuffs(H), slot_in_backpack)
var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
L.imp_in = H
L.implanted = 1

7
code/game/jobs/job_controller.dm
View File

@@ -419,7 +419,7 @@ var/global/datum/controller/occupations/job_master
H << "<b>You are playing a job that is important for Game Progression. If you have to disconnect, please notify the admins via adminhelp.</b>"
spawnId(H, rank, alt_title)
H.equip_to_slot_or_del(new /obj/item/device/radio/headset(H), slot_l_ear)
H.equip_or_collect(new /obj/item/device/radio/headset(H), slot_l_ear)
//Gives glasses to the vision impaired
if(H.disabilities & DISABILITY_FLAG_NEARSIGHTED)
@@ -459,9 +459,9 @@ var/global/datum/controller/occupations/job_master
if(H.mind && H.mind.initial_account)
C.associated_account_number = H.mind.initial_account.account_number
H.equip_to_slot_or_del(C, slot_wear_id)
H.equip_or_collect(C, slot_wear_id)
H.equip_to_slot_or_del(new /obj/item/device/pda(H), slot_belt)
H.equip_or_collect(new /obj/item/device/pda(H), slot_belt)
if(locate(/obj/item/device/pda,H))
var/obj/item/device/pda/pda = locate(/obj/item/device/pda,H)
pda.owner = H.real_name
@@ -471,6 +471,7 @@ var/global/datum/controller/occupations/job_master
return 1
proc/LoadJobs(jobsfile) //ran during round setup, reads info from jobs.txt -- Urist
if(!config.load_jobs_from_txt)
return 0

7
code/modules/mob/living/carbon/human/inventory.dm
View File

@@ -30,6 +30,13 @@
/mob/living/carbon/human/proc/is_on_ears(var/typepath)
return istype(l_ear,typepath) || istype(r_ear,typepath)
/mob/living/carbon/human/proc/is_in_hands(var/typepath)
if(istype(l_hand,typepath))
return l_hand
if(istype(r_hand,typepath))
return r_hand
return 0
// Return the item currently in the slot ID
/mob/living/carbon/human/get_item_by_slot(slot_id)
switch(slot_id)

8
code/modules/mob/living/carbon/species.dm
View File

@@ -181,7 +181,7 @@
H.u_equip(H.head)
H.u_equip(H.wear_mask) // CLOOOOWN
H.equip_to_slot_or_drop(new /obj/item/clothing/mask/breath/vox(H), slot_wear_mask)
H.equip_or_collect(new /obj/item/clothing/mask/breath/vox(H), slot_wear_mask)
var/suit=/obj/item/clothing/suit/space/vox/casual
var/helm=/obj/item/clothing/head/helmet/space/vox/casual
switch(H.mind.assigned_role)
@@ -197,9 +197,9 @@
if("Chief Medical Officer","Medical Doctor","Paramedic","Chemist")
suit=/obj/item/clothing/suit/space/vox/casual/medical
helm=/obj/item/clothing/head/helmet/space/vox/casual/medical
H.equip_to_slot_or_drop(new suit(H), slot_wear_suit)
H.equip_to_slot_or_drop(new helm(H), slot_head)
H.equip_to_slot_or_drop(new/obj/item/weapon/tank/nitrogen(H), slot_s_store)
H.equip_or_collect(new suit(H), slot_wear_suit)
H.equip_or_collect(new helm(H), slot_head)
H.equip_or_collect(new/obj/item/weapon/tank/nitrogen(H), slot_s_store)
H << "\blue You are now running on nitrogen internals from the [H.s_store] in your suit storage. Your species finds oxygen toxic, so you must breathe nitrogen only."
H.internal = H.s_store
if (H.internals)

15
code/modules/mob/mob.dm
View File

@@ -411,6 +411,19 @@
/mob/proc/equip_to_slot_or_drop(obj/item/W as obj, slot)
return equip_to_slot_if_possible(W, slot, EQUIP_FAILACTION_DROP, 1, 0)
// Convinience proc. Collects crap that fails to equip either onto the mob's back, or drops it.
// Used in job equipping so shit doesn't pile up at the start loc.
/mob/living/carbon/human/proc/equip_or_collect(var/obj/item/W, var/slot)
if(!equip_to_slot_or_drop(W, slot))
// Do I have a bag?
var/obj/item/weapon/storage/bag/plasticbag/B = is_in_hands(/obj/item/weapon/storage/bag/plasticbag)
if(!B)
// Gimme one.
B=new(null) // Null in case of failed equip.
if(!put_in_hands(B,slot_back))
return // Fuck it
B.handle_item_insertion(W,1)
//The list of slots by priority. equip_to_appropriate_slot() uses this list. Doesn't matter if a mob type doesn't have a slot.
var/list/slot_equipment_priority = list( \
slot_back,\
@@ -560,6 +573,8 @@ var/list/slot_equipment_priority = list( \
if(slot_w_uniform)
if( !(slot_flags & SLOT_ICLOTHING) )
return 0
if((FAT in H.mutations) && !(flags & ONESIZEFITSALL))
return 0
if(H.w_uniform)
if(H.w_uniform.canremove)
return 2