diff --git a/code/WorkInProgress/Sigyn/Department Sec/jobs.dm b/code/WorkInProgress/Sigyn/Department Sec/jobs.dm index 288234142e6..ee005a2e037 100644 --- a/code/WorkInProgress/Sigyn/Department Sec/jobs.dm +++ b/code/WorkInProgress/Sigyn/Department Sec/jobs.dm @@ -3,8 +3,8 @@ var/list/sec_departments = list("engineering", "supply", "medical", "science") /datum/job/officer/proc/assign_sec_to_department(var/mob/living/carbon/human/H) if(!H) return 0 if(!sec_departments.len) - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/security(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/headset_sec(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_ears) else var/department = pick(sec_departments) sec_departments -= department @@ -12,23 +12,23 @@ var/list/sec_departments = list("engineering", "supply", "medical", "science") var/destination = null switch(department) if("supply") - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/security/cargo(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/headset_sec/department/supply(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security/cargo(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec/department/supply(H), slot_ears) dep_access = list(access_mailsorting, access_mining) destination = /area/security/checkpoint/supply if("engineering") - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/security/engine(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/headset_sec/department/engi(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security/engine(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec/department/engi(H), slot_ears) dep_access = list(access_construction, access_engine) destination = /area/security/checkpoint/engineering if("medical") - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/security/med(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/headset_sec/department/med(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security/med(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec/department/med(H), slot_ears) dep_access = list(access_medical) destination = /area/security/checkpoint/medical if("science") - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/security/science(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/headset_sec/department/sci(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security/science(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec/department/sci(H), slot_ears) dep_access = list(access_research) destination = /area/security/checkpoint/science var/teleport = 0 @@ -64,21 +64,21 @@ var/list/sec_departments = list("engineering", "supply", "medical", "science") equip(var/mob/living/carbon/human/H) if(!H) return 0 - if(H.backbag == 2) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/security(H), slot_back) - if(H.backbag == 3) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/satchel_sec(H), slot_back) + if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(H), slot_back) + if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_sec(H), slot_back) assign_sec_to_department(H) - H.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) - H.equip_to_slot_or_qdel(new /obj/item/device/pda/security(H), slot_belt) - H.equip_to_slot_or_qdel(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit) - H.equip_to_slot_or_qdel(new /obj/item/clothing/head/helmet(H), slot_head) - H.equip_to_slot_or_qdel(new /obj/item/weapon/handcuffs(H), slot_s_store) - H.equip_to_slot_or_qdel(new /obj/item/device/flash(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/pda/security(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit) + H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(H), slot_head) + H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_s_store) + H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store) if(H.backbag == 1) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - H.equip_to_slot_or_qdel(new /obj/item/weapon/handcuffs(H), slot_l_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_l_hand) else - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) - H.equip_to_slot_or_qdel(new /obj/item/weapon/handcuffs(H), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + H.equip_to_slot_or_del(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 diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index 987a84d45aa..ff62ff8327e 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -195,7 +195,7 @@ var/const/tk_maxrange = 15 return 1 */ -//equip_to_slot_or_qdel(obj/item/W, slot, qdel_on_fail = 1) +//equip_to_slot_or_del(obj/item/W, slot, qdel_on_fail = 1) /* if(istype(user, /mob/living/carbon)) if(user:mutations & TK && get_dist(source, user) <= 7) diff --git a/code/game/gamemodes/antag_spawner.dm b/code/game/gamemodes/antag_spawner.dm index 94cf62a034f..9d33e32f6af 100644 --- a/code/game/gamemodes/antag_spawner.dm +++ b/code/game/gamemodes/antag_spawner.dm @@ -78,7 +78,7 @@ if("healing") M.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/charge(null) M.mind.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/forcewall(null) - M.equip_to_slot_or_qdel(new /obj/item/weapon/gun/magic/staff/healing(M), slot_r_hand) + M.equip_to_slot_or_del(new /obj/item/weapon/gun/magic/staff/healing(M), slot_r_hand) M << "Your service has not gone unrewarded, however. Studying under [usr.real_name], you have learned livesaving survival spells. You are able to cast charge and forcewall." if("robeless") M.mind.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/knock(null) @@ -104,14 +104,14 @@ M.mind.special_role = "apprentice" /obj/item/weapon/antag_spawner/contract/equip_antag(mob/target as mob) - target.equip_to_slot_or_qdel(new /obj/item/device/radio/headset(target), slot_ears) - target.equip_to_slot_or_qdel(new /obj/item/clothing/under/lightpurple(target), slot_w_uniform) - target.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/sandal(target), slot_shoes) - target.equip_to_slot_or_qdel(new /obj/item/clothing/suit/wizrobe(target), slot_wear_suit) - target.equip_to_slot_or_qdel(new /obj/item/clothing/head/wizard(target), slot_head) - target.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack(target), slot_back) - target.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box(target), slot_in_backpack) - target.equip_to_slot_or_qdel(new /obj/item/weapon/teleportation_scroll/apprentice(target), slot_r_store) + target.equip_to_slot_or_del(new /obj/item/device/radio/headset(target), slot_ears) + target.equip_to_slot_or_del(new /obj/item/clothing/under/lightpurple(target), slot_w_uniform) + target.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(target), slot_shoes) + target.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(target), slot_wear_suit) + target.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(target), slot_head) + target.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(target), slot_back) + target.equip_to_slot_or_del(new /obj/item/weapon/storage/box(target), slot_in_backpack) + target.equip_to_slot_or_del(new /obj/item/weapon/teleportation_scroll/apprentice(target), slot_r_store) /obj/item/weapon/antag_spawner/borg_tele name = "Syndicate Cyborg Teleporter" diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 30cb1d24803..2a25d107199 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -1060,10 +1060,10 @@ var/list/sacrificed = list() usr.visible_message("\red The rune disappears with a flash of red light, and a set of armor appears on [usr]...", \ "\red You are blinded by the flash of red light! After you're able to see again, you see that you are now wearing a set of armor.") - user.equip_to_slot_or_qdel(new /obj/item/clothing/head/culthood/alt(user), slot_head) - user.equip_to_slot_or_qdel(new /obj/item/clothing/suit/cultrobes/alt(user), slot_wear_suit) - user.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/cult(user), slot_shoes) - user.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/cultpack(user), slot_back) + user.equip_to_slot_or_del(new /obj/item/clothing/head/culthood/alt(user), slot_head) + user.equip_to_slot_or_del(new /obj/item/clothing/suit/cultrobes/alt(user), slot_wear_suit) + user.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(user), slot_shoes) + user.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/cultpack(user), slot_back) //the above update their overlay icons cache but do not call update_icons() //the below calls update_icons() at the end, which will update overlay icons by using the (now updated) cache user.put_in_hands(new /obj/item/weapon/melee/cultblade(user)) //put in hands or on floor diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index c418ab1fe73..664d606bb16 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -161,7 +161,7 @@ else var/mob/living/carbon/human/H = synd_mind.current P.loc = H.loc - H.equip_to_slot_or_qdel(P, slot_r_store, 0) + H.equip_to_slot_or_del(P, slot_r_store, 0) H.update_icons() else @@ -194,24 +194,24 @@ var/obj/item/device/radio/R = new /obj/item/device/radio/headset/syndicate(synd_mob) R.set_frequency(radio_freq) - synd_mob.equip_to_slot_or_qdel(R, slot_ears) + synd_mob.equip_to_slot_or_del(R, slot_ears) - synd_mob.equip_to_slot_or_qdel(new /obj/item/clothing/under/syndicate(synd_mob), slot_w_uniform) - synd_mob.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/black(synd_mob), slot_shoes) - synd_mob.equip_to_slot_or_qdel(new /obj/item/clothing/suit/armor/vest(synd_mob), slot_wear_suit) - synd_mob.equip_to_slot_or_qdel(new /obj/item/clothing/gloves/combat(synd_mob), slot_gloves) - synd_mob.equip_to_slot_or_qdel(new /obj/item/clothing/head/helmet/swat(synd_mob), slot_head) - synd_mob.equip_to_slot_or_qdel(new /obj/item/weapon/card/id/syndicate(synd_mob), slot_wear_id) - if(synd_mob.backbag == 2) synd_mob.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack(synd_mob), slot_back) - if(synd_mob.backbag == 3) synd_mob.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/satchel_norm(synd_mob), slot_back) - synd_mob.equip_to_slot_or_qdel(new /obj/item/ammo_box/magazine/m10mm(synd_mob), slot_in_backpack) - synd_mob.equip_to_slot_or_qdel(new /obj/item/weapon/reagent_containers/pill/cyanide(synd_mob), slot_in_backpack) - synd_mob.equip_to_slot_or_qdel(new /obj/item/weapon/gun/projectile/automatic/pistol(synd_mob), slot_belt) - synd_mob.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/engineer(synd_mob.back), slot_in_backpack) + synd_mob.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(synd_mob), slot_w_uniform) + synd_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(synd_mob), slot_shoes) + synd_mob.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(synd_mob), slot_wear_suit) + synd_mob.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(synd_mob), slot_gloves) + synd_mob.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/swat(synd_mob), slot_head) + synd_mob.equip_to_slot_or_del(new /obj/item/weapon/card/id/syndicate(synd_mob), slot_wear_id) + if(synd_mob.backbag == 2) synd_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(synd_mob), slot_back) + if(synd_mob.backbag == 3) synd_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(synd_mob), slot_back) + synd_mob.equip_to_slot_or_del(new /obj/item/ammo_box/magazine/m10mm(synd_mob), slot_in_backpack) + synd_mob.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/pill/cyanide(synd_mob), slot_in_backpack) + synd_mob.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/automatic/pistol(synd_mob), slot_belt) + synd_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(synd_mob.back), slot_in_backpack) var/obj/item/device/radio/uplink/U = new /obj/item/device/radio/uplink(synd_mob) U.hidden_uplink.uses = 10 - synd_mob.equip_to_slot_or_qdel(U, slot_in_backpack) + synd_mob.equip_to_slot_or_del(U, slot_in_backpack) var/obj/item/weapon/implant/explosive/E = new/obj/item/weapon/implant/explosive(synd_mob) E.imp_in = synd_mob diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index 0b0a06aa980..6306d8d5a6b 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -153,17 +153,17 @@ qdel(wizard_mob.r_store) qdel(wizard_mob.l_store) - wizard_mob.equip_to_slot_or_qdel(new /obj/item/device/radio/headset(wizard_mob), slot_ears) - wizard_mob.equip_to_slot_or_qdel(new /obj/item/clothing/under/lightpurple(wizard_mob), slot_w_uniform) - wizard_mob.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/sandal(wizard_mob), slot_shoes) - wizard_mob.equip_to_slot_or_qdel(new /obj/item/clothing/suit/wizrobe(wizard_mob), slot_wear_suit) - wizard_mob.equip_to_slot_or_qdel(new /obj/item/clothing/head/wizard(wizard_mob), slot_head) - if(wizard_mob.backbag == 2) wizard_mob.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack(wizard_mob), slot_back) - if(wizard_mob.backbag == 3) wizard_mob.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/satchel_norm(wizard_mob), slot_back) - wizard_mob.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/survival(wizard_mob), slot_in_backpack) -// wizard_mob.equip_to_slot_or_qdel(new /obj/item/weapon/scrying_gem(wizard_mob), slot_l_store) For scrying gem. - wizard_mob.equip_to_slot_or_qdel(new /obj/item/weapon/teleportation_scroll(wizard_mob), slot_r_store) - wizard_mob.equip_to_slot_or_qdel(new /obj/item/weapon/spellbook(wizard_mob), slot_r_hand) + wizard_mob.equip_to_slot_or_del(new /obj/item/device/radio/headset(wizard_mob), slot_ears) + wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/under/lightpurple(wizard_mob), slot_w_uniform) + wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(wizard_mob), slot_shoes) + wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(wizard_mob), slot_wear_suit) + wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(wizard_mob), slot_head) + if(wizard_mob.backbag == 2) wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(wizard_mob), slot_back) + if(wizard_mob.backbag == 3) wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(wizard_mob), slot_back) + wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(wizard_mob), slot_in_backpack) +// wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/scrying_gem(wizard_mob), slot_l_store) For scrying gem. + wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/teleportation_scroll(wizard_mob), slot_r_store) + wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/spellbook(wizard_mob), slot_r_hand) wizard_mob << "You will find a list of available spells in your spell book. Choose your magic arsenal carefully." wizard_mob << "In your pockets you will find a teleport scroll. Use it as needed." diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm index 3ecdd21d8a6..6692227bc4a 100644 --- a/code/game/jobs/job/assistant.dm +++ b/code/game/jobs/job/assistant.dm @@ -12,8 +12,8 @@ /datum/job/assistant/equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/color/grey(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/black(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) return 1 /datum/job/assistant/get_access() diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index 5a8d3b2b95b..da37da1b1af 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -16,22 +16,22 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/heads/captain(H), slot_ears) - if(H.backbag == 2) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/captain(H), slot_back) - if(H.backbag == 3) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/satchel_cap(H), slot_back) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(H), slot_ears) + if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/captain(H), slot_back) + if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_cap(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(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_qdel(U, slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/device/pda/captain(H), slot_belt) - H.equip_to_slot_or_qdel(new /obj/item/clothing/suit/armor/vest/capcarapace(H), slot_wear_suit) - H.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/brown(H), slot_shoes) - H.equip_to_slot_or_qdel(new /obj/item/clothing/head/caphat(H), slot_head) - H.equip_to_slot_or_qdel(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses) + H.equip_to_slot_or_del(U, slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/device/pda/captain(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/capcarapace(H), slot_wear_suit) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/head/caphat(H), slot_head) + H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses) if(H.backbag == 1) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/ids(H), slot_r_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(H), slot_r_hand) else - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/ids(H.back), slot_in_backpack) + H.equip_to_slot_or_del(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 @@ -71,17 +71,17 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/heads/hop(H), slot_ears) - if(H.backbag == 2) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack(H), slot_back) - if(H.backbag == 3) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/head_of_personnel(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/brown(H), slot_shoes) - H.equip_to_slot_or_qdel(new /obj/item/device/pda/heads/hop(H), slot_belt) - H.equip_to_slot_or_qdel(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit) - H.equip_to_slot_or_qdel(new /obj/item/clothing/head/helmet(H), slot_head) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/hop(H), slot_ears) + if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back) + if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/head_of_personnel(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/pda/heads/hop(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit) + H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(H), slot_head) if(H.backbag == 1) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/ids(H), slot_r_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(H), slot_r_hand) else - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/ids(H.back), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(H.back), slot_in_backpack) return 1 \ No newline at end of file diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index b49a80c9545..81909f02c94 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -14,27 +14,27 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - if(H.backbag == 2) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack(H), slot_back) - if(H.backbag == 3) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) - H.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/headset_srv(H), slot_ears) - H.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/black(H), slot_shoes) - H.equip_to_slot_or_qdel(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit) - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/bartender(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/device/pda/bar(H), slot_belt) + if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back) + if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_srv(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/bartender(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/device/pda/bar(H), slot_belt) if(H.backbag == 1) var/obj/item/weapon/storage/box/survival/Barpack = new /obj/item/weapon/storage/box/survival(H) - H.equip_to_slot_or_qdel(Barpack, slot_r_hand) + H.equip_to_slot_or_del(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_qdel(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) - H.equip_to_slot_or_qdel(new /obj/item/ammo_casing/shotgun/beanbag(H), slot_in_backpack) - H.equip_to_slot_or_qdel(new /obj/item/ammo_casing/shotgun/beanbag(H), slot_in_backpack) - H.equip_to_slot_or_qdel(new /obj/item/ammo_casing/shotgun/beanbag(H), slot_in_backpack) - H.equip_to_slot_or_qdel(new /obj/item/ammo_casing/shotgun/beanbag(H), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/ammo_casing/shotgun/beanbag(H), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/ammo_casing/shotgun/beanbag(H), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/ammo_casing/shotgun/beanbag(H), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/ammo_casing/shotgun/beanbag(H), slot_in_backpack) return 1 @@ -55,12 +55,12 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/headset_srv(H), slot_ears) - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/chef(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/clothing/suit/chef(H), slot_wear_suit) - H.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/black(H), slot_shoes) - H.equip_to_slot_or_qdel(new /obj/item/clothing/head/chefhat(H), slot_head) - H.equip_to_slot_or_qdel(new /obj/item/device/pda/chef(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_srv(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chef(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/chef(H), slot_wear_suit) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/head/chefhat(H), slot_head) + H.equip_to_slot_or_del(new /obj/item/device/pda/chef(H), slot_belt) return 1 @@ -80,13 +80,13 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/headset_srv(H), slot_ears) - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/hydroponics(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/black(H), slot_shoes) - H.equip_to_slot_or_qdel(new /obj/item/clothing/gloves/botanic_leather(H), slot_gloves) - H.equip_to_slot_or_qdel(new /obj/item/clothing/suit/apron(H), slot_wear_suit) - H.equip_to_slot_or_qdel(new /obj/item/device/analyzer/plant_analyzer(H), slot_s_store) - H.equip_to_slot_or_qdel(new /obj/item/device/pda/botanist(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_srv(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/hydroponics(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/botanic_leather(H), slot_gloves) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/apron(H), slot_wear_suit) + H.equip_to_slot_or_del(new /obj/item/device/analyzer/plant_analyzer(H), slot_s_store) + H.equip_to_slot_or_del(new /obj/item/device/pda/botanist(H), slot_belt) return 1 @@ -107,13 +107,13 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/headset_cargo(H), slot_ears) - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/cargo(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/brown(H), slot_shoes) - H.equip_to_slot_or_qdel(new /obj/item/device/pda/quartermaster(H), slot_belt) -// H.equip_to_slot_or_qdel(new /obj/item/clothing/gloves/black(H), slot_gloves) - H.equip_to_slot_or_qdel(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses) - H.equip_to_slot_or_qdel(new /obj/item/weapon/clipboard(H), slot_l_hand) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_cargo(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/cargo(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/pda/quartermaster(H), slot_belt) +// H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) + H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses) + H.equip_to_slot_or_del(new /obj/item/weapon/clipboard(H), slot_l_hand) return 1 @@ -133,11 +133,11 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/headset_cargo(H), slot_ears) - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/cargotech(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/black(H), slot_shoes) - H.equip_to_slot_or_qdel(new /obj/item/device/pda/cargo(H), slot_belt) -// H.equip_to_slot_or_qdel(new /obj/item/clothing/gloves/black(H), slot_gloves) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_cargo(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/cargotech(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/pda/cargo(H), slot_belt) +// H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) return 1 @@ -157,22 +157,22 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/headset_cargo (H), slot_ears) - if(H.backbag == 2) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/industrial (H), slot_back) - if(H.backbag == 3) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/satchel_eng(H), slot_back) - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/miner(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/device/pda/shaftminer(H), slot_belt) - H.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/black(H), slot_shoes) -// H.equip_to_slot_or_qdel(new /obj/item/clothing/gloves/black(H), slot_gloves) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_cargo (H), slot_ears) + if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/industrial (H), slot_back) + if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_eng(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/miner(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/device/pda/shaftminer(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) +// H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) if(H.backbag == 1) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/engineer(H), slot_r_hand) - H.equip_to_slot_or_qdel(new /obj/item/weapon/crowbar(H), slot_l_hand) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/bag/ore(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(H), slot_r_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/crowbar(H), slot_l_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/bag/ore(H), slot_l_store) else - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/engineer(H.back), slot_in_backpack) - H.equip_to_slot_or_qdel(new /obj/item/weapon/crowbar(H), slot_in_backpack) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/bag/ore(H), slot_in_backpack) - H.equip_to_slot_or_qdel(new /obj/item/weapon/mining_voucher(H), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(H.back), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/crowbar(H), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/bag/ore(H), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/mining_voucher(H), slot_in_backpack) return 1 @@ -194,17 +194,17 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 H.fully_replace_character_name(H.real_name, pick(clown_names)) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/clown(H), slot_back) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/clown(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/clown_shoes(H), slot_shoes) - H.equip_to_slot_or_qdel(new /obj/item/device/pda/clown(H), slot_belt) - H.equip_to_slot_or_qdel(new /obj/item/clothing/mask/gas/clown_hat(H), slot_wear_mask) - H.equip_to_slot_or_qdel(new /obj/item/weapon/reagent_containers/food/snacks/grown/banana(H, 50), slot_in_backpack) - H.equip_to_slot_or_qdel(new /obj/item/weapon/bikehorn(H), slot_in_backpack) - H.equip_to_slot_or_qdel(new /obj/item/weapon/stamp/clown(H), slot_in_backpack) - H.equip_to_slot_or_qdel(new /obj/item/toy/crayon/rainbow(H), slot_in_backpack) - H.equip_to_slot_or_qdel(new /obj/item/weapon/reagent_containers/spray/waterflower(H), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/clown(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/clown(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/pda/clown(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(H), slot_wear_mask) + H.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/food/snacks/grown/banana(H, 50), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/bikehorn(H), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/stamp/clown(H), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/toy/crayon/rainbow(H), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/spray/waterflower(H), slot_in_backpack) H.mutations.Add(CLUMSY) H.rename_self("clown") return 1 @@ -226,23 +226,23 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - if(H.backbag == 2) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack(H), slot_back) - if(H.backbag == 3) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/mime(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/black(H), slot_shoes) - H.equip_to_slot_or_qdel(new /obj/item/device/pda/mime(H), slot_belt) - H.equip_to_slot_or_qdel(new /obj/item/clothing/gloves/white(H), slot_gloves) - H.equip_to_slot_or_qdel(new /obj/item/clothing/mask/gas/mime(H), slot_wear_mask) - H.equip_to_slot_or_qdel(new /obj/item/clothing/head/beret(H), slot_head) - H.equip_to_slot_or_qdel(new /obj/item/clothing/suit/suspenders(H), slot_wear_suit) + if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back) + if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/clothing/under/mime(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/pda/mime(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/white(H), slot_gloves) + H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/mime(H), slot_wear_mask) + H.equip_to_slot_or_del(new /obj/item/clothing/head/beret(H), slot_head) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/suspenders(H), slot_wear_suit) if(H.backbag == 1) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - H.equip_to_slot_or_qdel(new /obj/item/toy/crayon/mime(H), slot_l_store) - H.equip_to_slot_or_qdel(new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(H), slot_l_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + H.equip_to_slot_or_del(new /obj/item/toy/crayon/mime(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(H), slot_l_hand) else - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) - H.equip_to_slot_or_qdel(new /obj/item/toy/crayon/mime(H), slot_in_backpack) - H.equip_to_slot_or_qdel(new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(H), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/toy/crayon/mime(H), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(H), slot_in_backpack) if(H.mind) H.mind.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/mime_wall(null) H.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/mime/speak(null) @@ -267,10 +267,10 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/janitor(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/headset_srv(H), slot_ears) - H.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/black(H), slot_shoes) - H.equip_to_slot_or_qdel(new /obj/item/device/pda/janitor(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/janitor(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_srv(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/pda/janitor(H), slot_belt) return 1 @@ -291,12 +291,12 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/suit_jacket/red(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/device/pda/librarian(H), slot_belt) - H.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/black(H), slot_shoes) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/bag/books(H), slot_l_hand) - H.equip_to_slot_or_qdel(new /obj/item/weapon/barcodescanner(H), slot_r_store) - H.equip_to_slot_or_qdel(new /obj/item/device/laser_pointer(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/red(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/device/pda/librarian(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/bag/books(H), slot_l_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/barcodescanner(H), slot_r_store) + H.equip_to_slot_or_del(new /obj/item/device/laser_pointer(H), slot_l_store) return 1 @@ -317,24 +317,24 @@ var/global/lawyer = 0//Checks for another lawyer equip(var/mob/living/carbon/human/H) if(!H) return 0 - if(H.backbag == 2) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack(H), slot_back) - if(H.backbag == 3) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) + if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back) + if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) if(!lawyer) lawyer = 1 - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/lawyer/bluesuit(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/clothing/suit/lawyer/bluejacket(H), slot_wear_suit) + H.equip_to_slot_or_del(new /obj/item/clothing/under/lawyer/bluesuit(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/lawyer/bluejacket(H), slot_wear_suit) else - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/lawyer/purpsuit(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/clothing/suit/lawyer/purpjacket(H), slot_wear_suit) - H.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/headset_sec(H), slot_ears) - H.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/brown(H), slot_shoes) - H.equip_to_slot_or_qdel(new /obj/item/device/pda/lawyer(H), slot_belt) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/briefcase(H), slot_l_hand) - H.equip_to_slot_or_qdel(new /obj/item/device/laser_pointer(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/clothing/under/lawyer/purpsuit(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/lawyer/purpjacket(H), slot_wear_suit) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/pda/lawyer(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/briefcase(H), slot_l_hand) + H.equip_to_slot_or_del(new /obj/item/device/laser_pointer(H), slot_l_store) if(H.backbag == 1) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) else - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) return 1 diff --git a/code/game/jobs/job/civilian_chaplain.dm b/code/game/jobs/job/civilian_chaplain.dm index a9c891630a4..8ed5737d8da 100644 --- a/code/game/jobs/job/civilian_chaplain.dm +++ b/code/game/jobs/job/civilian_chaplain.dm @@ -16,10 +16,10 @@ if(!H) return 0 var/obj/item/weapon/storage/bible/B = new /obj/item/weapon/storage/bible/booze(H) - H.equip_to_slot_or_qdel(B, slot_l_hand) - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/chaplain(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/device/pda/chaplain(H), slot_belt) - H.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/black(H), slot_shoes) + H.equip_to_slot_or_del(B, slot_l_hand) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chaplain(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/device/pda/chaplain(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) spawn(0) var/religion_name = "Christianity" var/new_religion = copytext(sanitize(input(H, "You are the Chaplain. Would you like to change your religion? Default is Christianity, in SPACE.", "Name change", religion_name)),1,MAX_NAME_LEN) diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index f4a0a79f289..eb069bc7abd 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -22,19 +22,19 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/heads/ce(H), slot_ears) - if(H.backbag == 2) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/industrial (H), slot_back) - if(H.backbag == 3) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/satchel_eng(H), slot_back) - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/chief_engineer(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/device/pda/heads/ce(H), slot_l_store) - H.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/brown(H), slot_shoes) - H.equip_to_slot_or_qdel(new /obj/item/clothing/head/hardhat/white(H), slot_head) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/belt/utility/full(H), slot_belt) - H.equip_to_slot_or_qdel(new /obj/item/clothing/gloves/black(H), slot_gloves) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/ce(H), slot_ears) + if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/industrial (H), slot_back) + if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_eng(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chief_engineer(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/device/pda/heads/ce(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white(H), slot_head) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/full(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) if(H.backbag == 1) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/engineer(H), slot_r_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(H), slot_r_hand) else - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/engineer(H.back), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(H.back), slot_in_backpack) return 1 @@ -55,19 +55,19 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/headset_eng(H), slot_ears) - if(H.backbag == 2) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/industrial(H), slot_back) - if(H.backbag == 3) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/satchel_eng(H), slot_back) - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/engineer(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/orange(H), slot_shoes) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/belt/utility/full(H), slot_belt) - H.equip_to_slot_or_qdel(new /obj/item/clothing/head/hardhat(H), slot_head) - H.equip_to_slot_or_qdel(new /obj/item/device/t_scanner(H), slot_r_store) - H.equip_to_slot_or_qdel(new /obj/item/device/pda/engineering(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_eng(H), slot_ears) + if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/industrial(H), slot_back) + if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_eng(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/engineer(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/full(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat(H), slot_head) + H.equip_to_slot_or_del(new /obj/item/device/t_scanner(H), slot_r_store) + H.equip_to_slot_or_del(new /obj/item/device/pda/engineering(H), slot_l_store) if(H.backbag == 1) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/engineer(H), slot_r_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(H), slot_r_hand) else - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/engineer(H.back), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(H.back), slot_in_backpack) return 1 @@ -87,16 +87,16 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/headset_eng(H), slot_ears) - if(H.backbag == 2) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack(H), slot_back) - if(H.backbag == 3) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/atmospheric_technician(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/black(H), slot_shoes) - H.equip_to_slot_or_qdel(new /obj/item/device/pda/atmos(H), slot_l_store) - H.equip_to_slot_or_qdel(new /obj/item/device/analyzer(H), slot_r_store) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/belt/utility/atmostech/(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_eng(H), slot_ears) + if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back) + if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/atmospheric_technician(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/pda/atmos(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/device/analyzer(H), slot_r_store) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/atmostech/(H), slot_belt) if(H.backbag == 1) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/engineer(H), slot_r_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(H), slot_r_hand) else - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/engineer(H.back), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(H.back), slot_in_backpack) return 1 \ No newline at end of file diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 4292767725f..916c8b89e09 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -19,19 +19,19 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/heads/cmo(H), slot_ears) - if(H.backbag == 2) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/medic (H), slot_back) - if(H.backbag == 3) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/satchel_med(H), slot_back) - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/chief_medical_officer(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/brown(H), slot_shoes) - H.equip_to_slot_or_qdel(new /obj/item/device/pda/heads/cmo(H), slot_belt) - H.equip_to_slot_or_qdel(new /obj/item/clothing/suit/labcoat/cmo(H), slot_wear_suit) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/firstaid/regular(H), slot_l_hand) - H.equip_to_slot_or_qdel(new /obj/item/device/flashlight/pen(H), slot_s_store) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/cmo(H), slot_ears) + if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/medic (H), slot_back) + if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_med(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chief_medical_officer(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/pda/heads/cmo(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/labcoat/cmo(H), slot_wear_suit) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/regular(H), slot_l_hand) + H.equip_to_slot_or_del(new /obj/item/device/flashlight/pen(H), slot_s_store) if(H.backbag == 1) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) else - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) return 1 @@ -51,19 +51,19 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/headset_med(H), slot_ears) - if(H.backbag == 2) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/medic (H), slot_back) - if(H.backbag == 3) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/satchel_med(H), slot_back) - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/white(H), slot_shoes) - H.equip_to_slot_or_qdel(new /obj/item/device/pda/medical(H), slot_belt) - H.equip_to_slot_or_qdel(new /obj/item/clothing/suit/labcoat(H), slot_wear_suit) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/firstaid/regular(H), slot_l_hand) - H.equip_to_slot_or_qdel(new /obj/item/device/flashlight/pen(H), slot_s_store) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_med(H), slot_ears) + if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/medic (H), slot_back) + if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_med(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/pda/medical(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/labcoat(H), slot_wear_suit) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/regular(H), slot_l_hand) + H.equip_to_slot_or_del(new /obj/item/device/flashlight/pen(H), slot_s_store) if(H.backbag == 1) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) else - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) return 1 @@ -84,11 +84,11 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/headset_med(H), slot_ears) - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/chemist(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/white(H), slot_shoes) - H.equip_to_slot_or_qdel(new /obj/item/device/pda/chemist(H), slot_belt) - H.equip_to_slot_or_qdel(new /obj/item/clothing/suit/labcoat/chemist(H), slot_wear_suit) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_med(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chemist(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/pda/chemist(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/labcoat/chemist(H), slot_wear_suit) return 1 @@ -108,12 +108,12 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/headset_medsci(H), slot_ears) - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/geneticist(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/white(H), slot_shoes) - H.equip_to_slot_or_qdel(new /obj/item/device/pda/geneticist(H), slot_belt) - H.equip_to_slot_or_qdel(new /obj/item/clothing/suit/labcoat/genetics(H), slot_wear_suit) - H.equip_to_slot_or_qdel(new /obj/item/device/flashlight/pen(H), slot_s_store) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_medsci(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/geneticist(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/pda/geneticist(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/labcoat/genetics(H), slot_wear_suit) + H.equip_to_slot_or_del(new /obj/item/device/flashlight/pen(H), slot_s_store) return 1 @@ -133,19 +133,19 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/headset_med(H), slot_ears) - if(H.backbag == 2) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/medic (H), slot_back) - if(H.backbag == 3) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/satchel_med(H), slot_back) - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/virologist(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/device/pda/viro(H), slot_belt) - H.equip_to_slot_or_qdel(new /obj/item/clothing/mask/surgical(H), slot_wear_mask) - H.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/white(H), slot_shoes) - H.equip_to_slot_or_qdel(new /obj/item/clothing/suit/labcoat/virologist(H), slot_wear_suit) - H.equip_to_slot_or_qdel(new /obj/item/device/flashlight/pen(H), slot_s_store) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_med(H), slot_ears) + if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/medic (H), slot_back) + if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_med(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/virologist(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/device/pda/viro(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(H), slot_wear_mask) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/labcoat/virologist(H), slot_wear_suit) + H.equip_to_slot_or_del(new /obj/item/device/flashlight/pen(H), slot_s_store) if(H.backbag == 1) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) else - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) return 1 diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index a51a4bf1e13..1a953fc0d8b 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -21,13 +21,13 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/heads/rd(H), slot_ears) - H.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/brown(H), slot_shoes) - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/research_director(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/device/pda/heads/rd(H), slot_belt) - H.equip_to_slot_or_qdel(new /obj/item/clothing/suit/labcoat(H), slot_wear_suit) - H.equip_to_slot_or_qdel(new /obj/item/weapon/clipboard(H), slot_l_hand) - H.equip_to_slot_or_qdel(new /obj/item/device/laser_pointer(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/rd(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/research_director(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/device/pda/heads/rd(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/labcoat(H), slot_wear_suit) + H.equip_to_slot_or_del(new /obj/item/weapon/clipboard(H), slot_l_hand) + H.equip_to_slot_or_del(new /obj/item/device/laser_pointer(H), slot_l_store) return 1 @@ -47,13 +47,13 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/headset_sci(H), slot_ears) - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/scientist(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/white(H), slot_shoes) - H.equip_to_slot_or_qdel(new /obj/item/device/pda/toxins(H), slot_belt) - H.equip_to_slot_or_qdel(new /obj/item/clothing/suit/labcoat/science(H), slot_wear_suit) -// H.equip_to_slot_or_qdel(new /obj/item/clothing/mask/gas(H), slot_wear_mask) -// H.equip_to_slot_or_qdel(new /obj/item/weapon/tank/oxygen(H), slot_l_hand) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sci(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/scientist(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/pda/toxins(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/labcoat/science(H), slot_wear_suit) +// H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(H), slot_wear_mask) +// H.equip_to_slot_or_del(new /obj/item/weapon/tank/oxygen(H), slot_l_hand) return 1 @@ -72,17 +72,17 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/headset_sci(H), slot_ears) - if(H.backbag == 2) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack(H), slot_back) - if(H.backbag == 3) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/roboticist(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/black(H), slot_shoes) - H.equip_to_slot_or_qdel(new /obj/item/device/pda/roboticist(H), slot_belt) - H.equip_to_slot_or_qdel(new /obj/item/clothing/suit/labcoat(H), slot_wear_suit) -// H.equip_to_slot_or_qdel(new /obj/item/clothing/gloves/black(H), slot_gloves) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/toolbox/mechanical(H), slot_l_hand) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sci(H), slot_ears) + if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back) + if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/roboticist(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/pda/roboticist(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/labcoat(H), slot_wear_suit) +// H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/toolbox/mechanical(H), slot_l_hand) if(H.backbag == 1) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) else - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) return 1 \ No newline at end of file diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 2d25e65b293..1a82088422d 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -27,24 +27,24 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - if(H.backbag == 2) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/security (H), slot_back) - if(H.backbag == 3) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/satchel_sec(H), slot_back) - H.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/heads/hos(H), slot_ears) - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/head_of_security(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) - H.equip_to_slot_or_qdel(new /obj/item/device/pda/heads/hos(H), slot_belt) - H.equip_to_slot_or_qdel(new /obj/item/clothing/suit/armor/hos(H), slot_wear_suit) - H.equip_to_slot_or_qdel(new /obj/item/clothing/gloves/black(H), slot_gloves) - H.equip_to_slot_or_qdel(new /obj/item/clothing/head/helmet/HoS(H), slot_head) -// H.equip_to_slot_or_qdel(new /obj/item/clothing/mask/gas(H), slot_wear_mask) //Grab one from the armory you donk - H.equip_to_slot_or_qdel(new /obj/item/clothing/glasses/sunglasses/sechud(H), slot_glasses) - H.equip_to_slot_or_qdel(new /obj/item/weapon/gun/energy/gun(H), slot_s_store) + if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security (H), slot_back) + if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_sec(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/hos(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/head_of_security(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/pda/heads/hos(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/hos(H), slot_wear_suit) + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) + H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/HoS(H), slot_head) +// H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(H), slot_wear_mask) //Grab one from the armory you donk + H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(H), slot_glasses) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/gun(H), slot_s_store) if(H.backbag == 1) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - H.equip_to_slot_or_qdel(new /obj/item/weapon/handcuffs(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_l_store) else - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) - H.equip_to_slot_or_qdel(new /obj/item/weapon/handcuffs(H), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + H.equip_to_slot_or_del(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 @@ -67,24 +67,24 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/headset_sec(H), slot_ears) - if(H.backbag == 2) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/security(H), slot_back) - if(H.backbag == 3) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/satchel_sec(H), slot_back) - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/warden(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) - H.equip_to_slot_or_qdel(new /obj/item/device/pda/warden(H), slot_belt) - H.equip_to_slot_or_qdel(new /obj/item/clothing/suit/armor/vest/warden(H), slot_wear_suit) - H.equip_to_slot_or_qdel(new /obj/item/clothing/head/helmet/warden(H), slot_head) - H.equip_to_slot_or_qdel(new /obj/item/clothing/gloves/black(H), slot_gloves) - H.equip_to_slot_or_qdel(new /obj/item/clothing/glasses/sunglasses/sechud(H), slot_glasses) -// H.equip_to_slot_or_qdel(new /obj/item/clothing/mask/gas(H), slot_wear_mask) //Grab one from the armory you donk - H.equip_to_slot_or_qdel(new /obj/item/device/flash(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_ears) + if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(H), slot_back) + if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_sec(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/warden(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/pda/warden(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/warden(H), slot_wear_suit) + H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/warden(H), slot_head) + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) + H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(H), slot_glasses) +// H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(H), slot_wear_mask) //Grab one from the armory you donk + H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store) if(H.backbag == 1) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - H.equip_to_slot_or_qdel(new /obj/item/weapon/handcuffs(H), slot_l_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_l_hand) else - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) - H.equip_to_slot_or_qdel(new /obj/item/weapon/handcuffs(H), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + H.equip_to_slot_or_del(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 @@ -111,28 +111,28 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/headset_sec(H), slot_ears) - if(H.backbag == 2) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack(H), slot_back) - if(H.backbag == 3) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/det(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/brown(H), slot_shoes) - H.equip_to_slot_or_qdel(new /obj/item/device/pda/detective(H), slot_belt) - H.equip_to_slot_or_qdel(new /obj/item/clothing/head/det_hat(H), slot_head) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_ears) + if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back) + if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/clothing/under/det(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/pda/detective(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/head/det_hat(H), slot_head) var/obj/item/clothing/mask/cigarette/CIG = new /obj/item/clothing/mask/cigarette(H) CIG.light("") - H.equip_to_slot_or_qdel(CIG, slot_wear_mask) - H.equip_to_slot_or_qdel(new /obj/item/clothing/gloves/black(H), slot_gloves) - H.equip_to_slot_or_qdel(new /obj/item/clothing/suit/det_suit(H), slot_wear_suit) - H.equip_to_slot_or_qdel(new /obj/item/weapon/lighter/zippo(H), slot_l_store) + H.equip_to_slot_or_del(CIG, slot_wear_mask) + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/det_suit(H), slot_wear_suit) + H.equip_to_slot_or_del(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_qdel(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/evidence(H), slot_l_hand) - H.equip_to_slot_or_qdel(new /obj/item/device/detective_scanner(H), slot_r_store) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/evidence(H), slot_l_hand) + H.equip_to_slot_or_del(new /obj/item/device/detective_scanner(H), slot_r_store) else - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/evidence(H), slot_in_backpack) - H.equip_to_slot_or_qdel(new /obj/item/device/detective_scanner(H), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/evidence(H), slot_in_backpack) + H.equip_to_slot_or_del(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 @@ -157,22 +157,22 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/headset_sec(H), slot_ears) - if(H.backbag == 2) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/security(H), slot_back) - if(H.backbag == 3) H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/satchel_sec(H), slot_back) - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/security(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) - H.equip_to_slot_or_qdel(new /obj/item/device/pda/security(H), slot_belt) - H.equip_to_slot_or_qdel(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit) - H.equip_to_slot_or_qdel(new /obj/item/clothing/head/helmet(H), slot_head) - H.equip_to_slot_or_qdel(new /obj/item/weapon/handcuffs(H), slot_s_store) - H.equip_to_slot_or_qdel(new /obj/item/device/flash(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_ears) + if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(H), slot_back) + if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_sec(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/pda/security(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit) + H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(H), slot_head) + H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_s_store) + H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store) if(H.backbag == 1) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - H.equip_to_slot_or_qdel(new /obj/item/weapon/handcuffs(H), slot_l_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_l_hand) else - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) - H.equip_to_slot_or_qdel(new /obj/item/weapon/handcuffs(H), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + H.equip_to_slot_or_del(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 diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index 41daef2bf49..635e741ec28 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -324,15 +324,15 @@ var/global/datum/controller/occupations/job_master else switch(H.backbag) if(1) - H.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) if(2) var/obj/item/weapon/storage/backpack/BPK = new/obj/item/weapon/storage/backpack(H) new /obj/item/weapon/storage/box/survival(BPK) - H.equip_to_slot_or_qdel(BPK, slot_back,1) + H.equip_to_slot_or_del(BPK, slot_back,1) if(3) var/obj/item/weapon/storage/backpack/BPK = new/obj/item/weapon/storage/backpack/satchel_norm(H) new /obj/item/weapon/storage/box/survival(BPK) - H.equip_to_slot_or_qdel(BPK, slot_back,1) + H.equip_to_slot_or_del(BPK, slot_back,1) H << "You are the [rank]." H << "As the [rank] you answer directly to [job.supervisors]. Special circumstances may change this." @@ -340,7 +340,7 @@ var/global/datum/controller/occupations/job_master H << "You are playing a job that is important for Game Progression. If you have to disconnect, please notify the admins via adminhelp." spawnId(H,rank) - H.equip_to_slot_or_qdel(new /obj/item/device/radio/headset(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset(H), slot_ears) H.update_hud() // Tmp fix for Github issue 1006. TODO: make all procs in update_icons.dm do client.screen |= equipment no matter what. return 1 @@ -367,12 +367,12 @@ var/global/datum/controller/occupations/job_master C.registered_name = H.real_name C.assignment = rank C.name = "[C.registered_name]'s ID Card ([C.assignment])" - H.equip_to_slot_or_qdel(C, slot_wear_id) + H.equip_to_slot_or_del(C, slot_wear_id) /* if(prob(50)) - H.equip_to_slot_or_qdel(new /obj/item/weapon/pen(H), slot_r_store) + H.equip_to_slot_or_del(new /obj/item/weapon/pen(H), slot_r_store) else - H.equip_to_slot_or_qdel(new /obj/item/weapon/pen/blue(H), slot_r_store)*/ - H.equip_to_slot_or_qdel(new /obj/item/device/pda(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/weapon/pen/blue(H), slot_r_store)*/ + H.equip_to_slot_or_del(new /obj/item/device/pda(H), slot_belt) if(locate(/obj/item/device/pda,H))//I bet this could just use locate. It can --SkyMarshal var/obj/item/device/pda/pda = locate(/obj/item/device/pda,H) pda.owner = H.real_name diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index f732a5cf821..b1087afccad 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1075,8 +1075,8 @@ if(istype(M, /mob/living/carbon/human)) var/mob/living/carbon/human/observer = M - observer.equip_to_slot_or_qdel(new /obj/item/clothing/under/suit_jacket(observer), slot_w_uniform) - observer.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/black(observer), slot_shoes) + observer.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket(observer), slot_w_uniform) + observer.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(observer), slot_shoes) M.Paralyse(5) sleep(5) M.loc = pick(tdomeobserve) @@ -1285,9 +1285,9 @@ usr << "This can only be used on instances of type /mob/living/carbon/human" return - H.equip_to_slot_or_qdel( new /obj/item/weapon/reagent_containers/food/snacks/cookie(H), slot_l_hand ) + H.equip_to_slot_or_del( new /obj/item/weapon/reagent_containers/food/snacks/cookie(H), slot_l_hand ) if(!(istype(H.l_hand,/obj/item/weapon/reagent_containers/food/snacks/cookie))) - H.equip_to_slot_or_qdel( new /obj/item/weapon/reagent_containers/food/snacks/cookie(H), slot_r_hand ) + H.equip_to_slot_or_del( new /obj/item/weapon/reagent_containers/food/snacks/cookie(H), slot_r_hand ) if(!(istype(H.r_hand,/obj/item/weapon/reagent_containers/food/snacks/cookie))) log_admin("[key_name(H)] has their hands full, so they did not receive their cookie, spawned by [key_name(src.owner)].") message_admins("[key_name(H)] has their hands full, so they did not receive their cookie, spawned by [key_name(src.owner)].") diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index d81126ba5e1..8ac93b79d22 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -657,166 +657,166 @@ var/global/list/g_fancy_list_of_safe_types = null if ("assistant grey") var/obj/item/weapon/storage/backpack/BPK = new/obj/item/weapon/storage/backpack(M) new /obj/item/weapon/storage/box/survival(BPK) - M.equip_to_slot_or_qdel(BPK, slot_back,1) - M.equip_to_slot_or_qdel(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_qdel(new /obj/item/clothing/under/color/grey(M), slot_w_uniform) - M.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/black(M), slot_shoes) + M.equip_to_slot_or_del(BPK, slot_back,1) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), slot_shoes) var/obj/item/weapon/card/id/W = new(M) W.name = "[M.real_name]'s ID Card (Assistant)" W.assignment = "Assistant" W.registered_name = M.real_name - M.equip_to_slot_or_qdel(W, slot_wear_id) + M.equip_to_slot_or_del(W, slot_wear_id) var/obj/item/device/pda/P = new(M) P.owner = M.real_name P.ownjob = "Assistant" P.name = "PDA-[M.real_name] (Assistant)" - M.equip_to_slot_or_qdel(P, slot_belt) + M.equip_to_slot_or_del(P, slot_belt) if ("standard space gear") - M.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/black(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), slot_shoes) - M.equip_to_slot_or_qdel(new /obj/item/clothing/under/color/grey(M), slot_w_uniform) - M.equip_to_slot_or_qdel(new /obj/item/clothing/suit/space(M), slot_wear_suit) - M.equip_to_slot_or_qdel(new /obj/item/clothing/head/helmet/space(M), slot_head) + M.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/space(M), slot_wear_suit) + M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space(M), slot_head) var /obj/item/weapon/tank/jetpack/J = new /obj/item/weapon/tank/jetpack/oxygen(M) - M.equip_to_slot_or_qdel(J, slot_back) + M.equip_to_slot_or_del(J, slot_back) J.toggle() - M.equip_to_slot_or_qdel(new /obj/item/clothing/mask/breath(M), slot_wear_mask) + M.equip_to_slot_or_del(new /obj/item/clothing/mask/breath(M), slot_wear_mask) J.Topic(null, list("stat" = 1)) if ("tournament standard red","tournament standard green") //we think stunning weapon is too overpowered to use it on tournaments. --rastaf0 if (dresscode=="tournament standard red") - M.equip_to_slot_or_qdel(new /obj/item/clothing/under/color/red(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/under/color/red(M), slot_w_uniform) else - M.equip_to_slot_or_qdel(new /obj/item/clothing/under/color/green(M), slot_w_uniform) - M.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/black(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/clothing/under/color/green(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), slot_shoes) - M.equip_to_slot_or_qdel(new /obj/item/clothing/suit/armor/vest(M), slot_wear_suit) - M.equip_to_slot_or_qdel(new /obj/item/clothing/head/helmet/thunderdome(M), slot_head) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(M), slot_wear_suit) + M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/thunderdome(M), slot_head) - M.equip_to_slot_or_qdel(new /obj/item/weapon/gun/energy/pulse_rifle/destroyer(M), slot_r_hand) - M.equip_to_slot_or_qdel(new /obj/item/weapon/kitchenknife(M), slot_l_hand) - M.equip_to_slot_or_qdel(new /obj/item/weapon/grenade/smokebomb(M), slot_r_store) + M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle/destroyer(M), slot_r_hand) + M.equip_to_slot_or_del(new /obj/item/weapon/kitchenknife(M), slot_l_hand) + M.equip_to_slot_or_del(new /obj/item/weapon/grenade/smokebomb(M), slot_r_store) if ("tournament gangster") //gangster are supposed to fight each other. --rastaf0 - M.equip_to_slot_or_qdel(new /obj/item/clothing/under/det(M), slot_w_uniform) - M.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/black(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/clothing/under/det(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), slot_shoes) - M.equip_to_slot_or_qdel(new /obj/item/clothing/suit/det_suit(M), slot_wear_suit) - M.equip_to_slot_or_qdel(new /obj/item/clothing/glasses/thermal/monocle(M), slot_glasses) - M.equip_to_slot_or_qdel(new /obj/item/clothing/head/det_hat(M), slot_head) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/det_suit(M), slot_wear_suit) + M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/monocle(M), slot_glasses) + M.equip_to_slot_or_del(new /obj/item/clothing/head/det_hat(M), slot_head) - M.equip_to_slot_or_qdel(new /obj/item/weapon/gun/projectile(M), slot_r_hand) - M.equip_to_slot_or_qdel(new /obj/item/ammo_box/a357(M), slot_l_store) + M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile(M), slot_r_hand) + M.equip_to_slot_or_del(new /obj/item/ammo_box/a357(M), slot_l_store) if ("tournament chef") //Steven Seagal FTW - M.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/chef(M), slot_w_uniform) - M.equip_to_slot_or_qdel(new /obj/item/clothing/suit/chef(M), slot_wear_suit) - M.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/black(M), slot_shoes) - M.equip_to_slot_or_qdel(new /obj/item/clothing/head/chefhat(M), slot_head) + M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chef(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/chef(M), slot_wear_suit) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/clothing/head/chefhat(M), slot_head) - M.equip_to_slot_or_qdel(new /obj/item/weapon/kitchen/rollingpin(M), slot_r_hand) - M.equip_to_slot_or_qdel(new /obj/item/weapon/kitchenknife(M), slot_l_hand) - M.equip_to_slot_or_qdel(new /obj/item/weapon/kitchenknife(M), slot_r_store) - M.equip_to_slot_or_qdel(new /obj/item/weapon/kitchenknife(M), slot_s_store) + M.equip_to_slot_or_del(new /obj/item/weapon/kitchen/rollingpin(M), slot_r_hand) + M.equip_to_slot_or_del(new /obj/item/weapon/kitchenknife(M), slot_l_hand) + M.equip_to_slot_or_del(new /obj/item/weapon/kitchenknife(M), slot_r_store) + M.equip_to_slot_or_del(new /obj/item/weapon/kitchenknife(M), slot_s_store) if ("tournament janitor") - M.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/janitor(M), slot_w_uniform) - M.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/black(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/janitor(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), slot_shoes) var/obj/item/weapon/storage/backpack/backpack = new(M) for(var/obj/item/I in backpack) qdel(I) - M.equip_to_slot_or_qdel(backpack, slot_back) + M.equip_to_slot_or_del(backpack, slot_back) - M.equip_to_slot_or_qdel(new /obj/item/weapon/mop(M), slot_r_hand) + M.equip_to_slot_or_del(new /obj/item/weapon/mop(M), slot_r_hand) var/obj/item/weapon/reagent_containers/glass/bucket/bucket = new(M) bucket.reagents.add_reagent("water", 70) - M.equip_to_slot_or_qdel(bucket, slot_l_hand) + M.equip_to_slot_or_del(bucket, slot_l_hand) - M.equip_to_slot_or_qdel(new /obj/item/weapon/grenade/chem_grenade/cleaner(M), slot_r_store) - M.equip_to_slot_or_qdel(new /obj/item/weapon/grenade/chem_grenade/cleaner(M), slot_l_store) - M.equip_to_slot_or_qdel(new /obj/item/stack/tile/plasteel(M), slot_in_backpack) - M.equip_to_slot_or_qdel(new /obj/item/stack/tile/plasteel(M), slot_in_backpack) - M.equip_to_slot_or_qdel(new /obj/item/stack/tile/plasteel(M), slot_in_backpack) - M.equip_to_slot_or_qdel(new /obj/item/stack/tile/plasteel(M), slot_in_backpack) - M.equip_to_slot_or_qdel(new /obj/item/stack/tile/plasteel(M), slot_in_backpack) - M.equip_to_slot_or_qdel(new /obj/item/stack/tile/plasteel(M), slot_in_backpack) - M.equip_to_slot_or_qdel(new /obj/item/stack/tile/plasteel(M), slot_in_backpack) + M.equip_to_slot_or_del(new /obj/item/weapon/grenade/chem_grenade/cleaner(M), slot_r_store) + M.equip_to_slot_or_del(new /obj/item/weapon/grenade/chem_grenade/cleaner(M), slot_l_store) + M.equip_to_slot_or_del(new /obj/item/stack/tile/plasteel(M), slot_in_backpack) + M.equip_to_slot_or_del(new /obj/item/stack/tile/plasteel(M), slot_in_backpack) + M.equip_to_slot_or_del(new /obj/item/stack/tile/plasteel(M), slot_in_backpack) + M.equip_to_slot_or_del(new /obj/item/stack/tile/plasteel(M), slot_in_backpack) + M.equip_to_slot_or_del(new /obj/item/stack/tile/plasteel(M), slot_in_backpack) + M.equip_to_slot_or_del(new /obj/item/stack/tile/plasteel(M), slot_in_backpack) + M.equip_to_slot_or_del(new /obj/item/stack/tile/plasteel(M), slot_in_backpack) if ("pirate") - M.equip_to_slot_or_qdel(new /obj/item/clothing/under/pirate(M), slot_w_uniform) - M.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/brown(M), slot_shoes) - M.equip_to_slot_or_qdel(new /obj/item/clothing/head/bandana(M), slot_head) - M.equip_to_slot_or_qdel(new /obj/item/clothing/glasses/eyepatch(M), slot_glasses) - M.equip_to_slot_or_qdel(new /obj/item/weapon/melee/energy/sword/pirate(M), slot_r_hand) + M.equip_to_slot_or_del(new /obj/item/clothing/under/pirate(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(M), slot_head) + M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), slot_glasses) + M.equip_to_slot_or_del(new /obj/item/weapon/melee/energy/sword/pirate(M), slot_r_hand) if ("space pirate") - M.equip_to_slot_or_qdel(new /obj/item/clothing/under/pirate(M), slot_w_uniform) - M.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/brown(M), slot_shoes) - M.equip_to_slot_or_qdel(new /obj/item/clothing/suit/space/pirate(M), slot_wear_suit) - M.equip_to_slot_or_qdel(new /obj/item/clothing/head/helmet/space/pirate(M), slot_head) - M.equip_to_slot_or_qdel(new /obj/item/clothing/glasses/eyepatch(M), slot_glasses) + M.equip_to_slot_or_del(new /obj/item/clothing/under/pirate(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/pirate(M), slot_wear_suit) + M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/pirate(M), slot_head) + M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), slot_glasses) - M.equip_to_slot_or_qdel(new /obj/item/weapon/melee/energy/sword/pirate(M), slot_r_hand) + M.equip_to_slot_or_del(new /obj/item/weapon/melee/energy/sword/pirate(M), slot_r_hand) /* if ("soviet soldier") - M.equip_to_slot_or_qdel(new /obj/item/clothing/under/soviet(M), slot_w_uniform) - M.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/black(M), slot_shoes) - M.equip_to_slot_or_qdel(new /obj/item/clothing/head/ushanka(M), slot_head) + M.equip_to_slot_or_del(new /obj/item/clothing/under/soviet(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(M), slot_head) */ if("tunnel clown")//Tunnel clowns rule! - M.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/clown(M), slot_w_uniform) - M.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/clown_shoes(M), slot_shoes) - M.equip_to_slot_or_qdel(new /obj/item/clothing/gloves/black(M), slot_gloves) - M.equip_to_slot_or_qdel(new /obj/item/clothing/mask/gas/clown_hat(M), slot_wear_mask) - M.equip_to_slot_or_qdel(new /obj/item/clothing/head/chaplain_hood(M), slot_head) - M.equip_to_slot_or_qdel(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_qdel(new /obj/item/clothing/glasses/thermal/monocle(M), slot_glasses) - M.equip_to_slot_or_qdel(new /obj/item/clothing/suit/chaplain_hoodie(M), slot_wear_suit) - M.equip_to_slot_or_qdel(new /obj/item/weapon/reagent_containers/food/snacks/grown/banana(M), slot_l_store) - M.equip_to_slot_or_qdel(new /obj/item/weapon/bikehorn(M), slot_r_store) + M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/clown(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(M), slot_gloves) + M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(M), slot_wear_mask) + M.equip_to_slot_or_del(new /obj/item/clothing/head/chaplain_hood(M), slot_head) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/monocle(M), slot_glasses) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/chaplain_hoodie(M), slot_wear_suit) + M.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/food/snacks/grown/banana(M), slot_l_store) + M.equip_to_slot_or_del(new /obj/item/weapon/bikehorn(M), slot_r_store) var/obj/item/weapon/card/id/W = new(M) W.name = "[M.real_name]'s ID Card" W.access = get_all_accesses() W.assignment = "Tunnel Clown!" W.registered_name = M.real_name - M.equip_to_slot_or_qdel(W, slot_wear_id) + M.equip_to_slot_or_del(W, slot_wear_id) var/obj/item/weapon/twohanded/fireaxe/fire_axe = new(M) - M.equip_to_slot_or_qdel(fire_axe, slot_r_hand) + M.equip_to_slot_or_del(fire_axe, slot_r_hand) if("masked killer") - M.equip_to_slot_or_qdel(new /obj/item/clothing/under/overalls(M), slot_w_uniform) - M.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/white(M), slot_shoes) - M.equip_to_slot_or_qdel(new /obj/item/clothing/gloves/latex(M), slot_gloves) - M.equip_to_slot_or_qdel(new /obj/item/clothing/mask/surgical(M), slot_wear_mask) - M.equip_to_slot_or_qdel(new /obj/item/clothing/head/welding(M), slot_head) - M.equip_to_slot_or_qdel(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_qdel(new /obj/item/clothing/glasses/thermal/monocle(M), slot_glasses) - M.equip_to_slot_or_qdel(new /obj/item/clothing/suit/apron(M), slot_wear_suit) - M.equip_to_slot_or_qdel(new /obj/item/weapon/kitchenknife(M), slot_l_store) - M.equip_to_slot_or_qdel(new /obj/item/weapon/scalpel(M), slot_r_store) + M.equip_to_slot_or_del(new /obj/item/clothing/under/overalls(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(M), slot_gloves) + M.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(M), slot_wear_mask) + M.equip_to_slot_or_del(new /obj/item/clothing/head/welding(M), slot_head) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/monocle(M), slot_glasses) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/apron(M), slot_wear_suit) + M.equip_to_slot_or_del(new /obj/item/weapon/kitchenknife(M), slot_l_store) + M.equip_to_slot_or_del(new /obj/item/weapon/scalpel(M), slot_r_store) var/obj/item/weapon/twohanded/fireaxe/fire_axe = new(M) - M.equip_to_slot_or_qdel(fire_axe, slot_r_hand) + M.equip_to_slot_or_del(fire_axe, slot_r_hand) for(var/obj/item/carried_item in M.contents) if(!istype(carried_item, /obj/item/weapon/implant))//If it's not an implant. carried_item.add_blood(M)//Oh yes, there will be blood... if("assassin") - M.equip_to_slot_or_qdel(new /obj/item/clothing/under/suit_jacket(M), slot_w_uniform) - M.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/black(M), slot_shoes) - M.equip_to_slot_or_qdel(new /obj/item/clothing/gloves/black(M), slot_gloves) - M.equip_to_slot_or_qdel(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_qdel(new /obj/item/clothing/glasses/sunglasses(M), slot_glasses) - M.equip_to_slot_or_qdel(new /obj/item/clothing/tie/waistcoat(M), slot_wear_suit) - M.equip_to_slot_or_qdel(new /obj/item/weapon/melee/energy/sword(M), slot_l_store) + M.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(M), slot_gloves) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(M), slot_glasses) + M.equip_to_slot_or_del(new /obj/item/clothing/tie/waistcoat(M), slot_wear_suit) + M.equip_to_slot_or_del(new /obj/item/weapon/melee/energy/sword(M), slot_l_store) var/obj/item/weapon/storage/secure/briefcase/sec_briefcase = new(M) for(var/obj/item/briefcase_item in sec_briefcase) @@ -827,52 +827,52 @@ var/global/list/g_fancy_list_of_safe_types = null sec_briefcase.contents += new /obj/item/weapon/gun/projectile/revolver/mateba sec_briefcase.contents += new /obj/item/ammo_box/a357 sec_briefcase.contents += new /obj/item/weapon/plastique - M.equip_to_slot_or_qdel(sec_briefcase, slot_l_hand) + M.equip_to_slot_or_del(sec_briefcase, slot_l_hand) var/obj/item/device/pda/heads/pda = new(M) pda.owner = M.real_name pda.ownjob = "Reaper" pda.name = "PDA-[M.real_name] ([pda.ownjob])" - M.equip_to_slot_or_qdel(pda, slot_belt) + M.equip_to_slot_or_del(pda, slot_belt) var/obj/item/weapon/card/id/syndicate/W = new(M) W.name = "[M.real_name]'s ID Card" W.access = get_all_accesses() W.assignment = "Reaper" W.registered_name = M.real_name - M.equip_to_slot_or_qdel(W, slot_wear_id) + M.equip_to_slot_or_del(W, slot_wear_id) // DEATH SQUADS if("death commando")//Was looking to add this for a while. var/obj/item/device/radio/R = new /obj/item/device/radio/headset(M) R.set_frequency(1441) - M.equip_to_slot_or_qdel(R, slot_ears) + M.equip_to_slot_or_del(R, slot_ears) - M.equip_to_slot_or_qdel(new /obj/item/clothing/under/color/green(M), slot_w_uniform) - M.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/swat(M), slot_shoes) - M.equip_to_slot_or_qdel(new /obj/item/clothing/suit/armor/swat(M), slot_wear_suit) - M.equip_to_slot_or_qdel(new /obj/item/clothing/gloves/combat(M), slot_gloves) - M.equip_to_slot_or_qdel(new /obj/item/clothing/head/helmet/space/deathsquad(M), slot_head) - M.equip_to_slot_or_qdel(new /obj/item/clothing/mask/gas/swat(M), slot_wear_mask) - M.equip_to_slot_or_qdel(new /obj/item/clothing/glasses/thermal(M), slot_glasses) + M.equip_to_slot_or_del(new /obj/item/clothing/under/color/green(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/swat(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/swat(M), slot_wear_suit) + M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) + M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad(M), slot_head) + M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/swat(M), slot_wear_mask) + M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal(M), slot_glasses) - M.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/security(M), slot_back) - M.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box(M), slot_in_backpack) + M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(M), slot_back) + M.equip_to_slot_or_del(new /obj/item/weapon/storage/box(M), slot_in_backpack) - M.equip_to_slot_or_qdel(new /obj/item/ammo_box/a357(M), slot_in_backpack) - M.equip_to_slot_or_qdel(new /obj/item/weapon/storage/firstaid/regular(M), slot_in_backpack) - M.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box/flashbangs(M), slot_in_backpack) - M.equip_to_slot_or_qdel(new /obj/item/device/flashlight(M), slot_in_backpack) + M.equip_to_slot_or_del(new /obj/item/ammo_box/a357(M), slot_in_backpack) + M.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/regular(M), slot_in_backpack) + M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/flashbangs(M), slot_in_backpack) + M.equip_to_slot_or_del(new /obj/item/device/flashlight(M), slot_in_backpack) - M.equip_to_slot_or_qdel(new /obj/item/weapon/plastique(M), slot_in_backpack) + M.equip_to_slot_or_del(new /obj/item/weapon/plastique(M), slot_in_backpack) - M.equip_to_slot_or_qdel(new /obj/item/weapon/melee/energy/sword(M), slot_l_store) - M.equip_to_slot_or_qdel(new /obj/item/weapon/grenade/flashbang(M), slot_r_store) - M.equip_to_slot_or_qdel(new /obj/item/weapon/tank/emergency_oxygen(M), slot_s_store) - M.equip_to_slot_or_qdel(new /obj/item/weapon/gun/projectile/revolver/mateba(M), slot_belt) + M.equip_to_slot_or_del(new /obj/item/weapon/melee/energy/sword(M), slot_l_store) + M.equip_to_slot_or_del(new /obj/item/weapon/grenade/flashbang(M), slot_r_store) + M.equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen(M), slot_s_store) + M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/revolver/mateba(M), slot_belt) - M.equip_to_slot_or_qdel(new /obj/item/weapon/gun/energy/pulse_rifle(M), slot_r_hand) + M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle(M), slot_r_hand) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(M)//Here you go Deuryn @@ -886,28 +886,28 @@ var/global/list/g_fancy_list_of_safe_types = null W.access += get_centcom_access("Death Commando")//Let's add their alloted Centcom access. W.assignment = "Death Commando" W.registered_name = M.real_name - M.equip_to_slot_or_qdel(W, slot_wear_id) + M.equip_to_slot_or_del(W, slot_wear_id) /* if("syndicate commando") M.equip_syndicate_commando() */ if("centcom official") - M.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/centcom_officer(M), slot_w_uniform) - M.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/black(M), slot_shoes) - M.equip_to_slot_or_qdel(new /obj/item/clothing/gloves/black(M), slot_gloves) - M.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/headset_com(M), slot_ears) - M.equip_to_slot_or_qdel(new /obj/item/clothing/glasses/sunglasses(M), slot_glasses) - M.equip_to_slot_or_qdel(new /obj/item/weapon/gun/energy/gun(M), slot_belt) - M.equip_to_slot_or_qdel(new /obj/item/weapon/pen(M), slot_l_store) + M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(M), slot_gloves) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_com(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(M), slot_glasses) + M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/gun(M), slot_belt) + M.equip_to_slot_or_del(new /obj/item/weapon/pen(M), slot_l_store) var/obj/item/device/pda/heads/pda = new(M) pda.owner = M.real_name pda.ownjob = "Centcom Official" pda.name = "PDA-[M.real_name] ([pda.ownjob])" - M.equip_to_slot_or_qdel(pda, slot_r_store) + M.equip_to_slot_or_del(pda, slot_r_store) - M.equip_to_slot_or_qdel(new /obj/item/weapon/clipboard(M), slot_l_hand) + M.equip_to_slot_or_del(new /obj/item/weapon/clipboard(M), slot_l_hand) var/obj/item/weapon/card/id/W = new(M) W.name = "[M.real_name]'s ID Card (Centcom Official)" @@ -915,20 +915,20 @@ var/global/list/g_fancy_list_of_safe_types = null W.access = get_centcom_access("Centcom Official") W.assignment = "Centcom Official" W.registered_name = M.real_name - M.equip_to_slot_or_qdel(W, slot_wear_id) + M.equip_to_slot_or_del(W, slot_wear_id) if("centcom commander") - M.equip_to_slot_or_qdel(new /obj/item/clothing/under/rank/centcom_commander(M), slot_w_uniform) - M.equip_to_slot_or_qdel(new /obj/item/clothing/suit/armor/bulletproof(M), slot_wear_suit) - M.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/swat(M), slot_shoes) - M.equip_to_slot_or_qdel(new /obj/item/clothing/gloves/combat(M), slot_gloves) - M.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/headset_cent(M), slot_ears) - M.equip_to_slot_or_qdel(new /obj/item/clothing/glasses/eyepatch(M), slot_glasses) - M.equip_to_slot_or_qdel(new /obj/item/clothing/mask/cigarette/cigar/cohiba(M), slot_wear_mask) - M.equip_to_slot_or_qdel(new /obj/item/clothing/head/centhat(M), slot_head) - M.equip_to_slot_or_qdel(new /obj/item/weapon/gun/projectile/revolver/mateba(M), slot_belt) - M.equip_to_slot_or_qdel(new /obj/item/weapon/lighter/zippo(M), slot_r_store) - M.equip_to_slot_or_qdel(new /obj/item/ammo_box/a357(M), slot_l_store) + M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_commander(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/bulletproof(M), slot_wear_suit) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/swat(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_cent(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), slot_glasses) + M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/cohiba(M), slot_wear_mask) + M.equip_to_slot_or_del(new /obj/item/clothing/head/centhat(M), slot_head) + M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/revolver/mateba(M), slot_belt) + M.equip_to_slot_or_del(new /obj/item/weapon/lighter/zippo(M), slot_r_store) + M.equip_to_slot_or_del(new /obj/item/ammo_box/a357(M), slot_l_store) var/obj/item/weapon/card/id/W = new(M) W.name = "[M.real_name]'s ID Card (Centcom Commander)" @@ -937,23 +937,23 @@ var/global/list/g_fancy_list_of_safe_types = null W.access += get_centcom_access("Centcom Commander") W.assignment = "Centcom Commander" W.registered_name = M.real_name - M.equip_to_slot_or_qdel(W, slot_wear_id) + M.equip_to_slot_or_del(W, slot_wear_id) if("special ops officer") var/obj/item/device/radio/headset/R = new /obj/item/device/radio/headset/headset_cent(M) R.set_frequency(1441) - M.equip_to_slot_or_qdel(R, slot_ears) + M.equip_to_slot_or_del(R, slot_ears) - M.equip_to_slot_or_qdel(new /obj/item/clothing/under/syndicate/combat(M), slot_w_uniform) - M.equip_to_slot_or_qdel(new /obj/item/clothing/suit/armor/swat/officer(M), slot_wear_suit) - M.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/swat/combat(M), slot_shoes) - M.equip_to_slot_or_qdel(new /obj/item/clothing/gloves/combat(M), slot_gloves) - M.equip_to_slot_or_qdel(new /obj/item/clothing/glasses/thermal/eyepatch(M), slot_glasses) - M.equip_to_slot_or_qdel(new /obj/item/clothing/mask/cigarette/cigar/havana(M), slot_wear_mask) - M.equip_to_slot_or_qdel(new /obj/item/clothing/head/helmet/space/deathsquad/beret(M), slot_head) - M.equip_to_slot_or_qdel(new /obj/item/weapon/gun/energy/pulse_rifle/M1911(M), slot_belt) - M.equip_to_slot_or_qdel(new /obj/item/weapon/lighter/zippo(M), slot_r_store) - M.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/satchel(M), slot_back) + M.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate/combat(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/swat/officer(M), slot_wear_suit) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/swat/combat(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) + M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/eyepatch(M), slot_glasses) + M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/havana(M), slot_wear_mask) + M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad/beret(M), slot_head) + M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle/M1911(M), slot_belt) + M.equip_to_slot_or_del(new /obj/item/weapon/lighter/zippo(M), slot_r_store) + M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(M), slot_back) var/obj/item/weapon/card/id/W = new(M) W.name = "[M.real_name]'s ID Card (Special Ops Officer)" @@ -962,53 +962,53 @@ var/global/list/g_fancy_list_of_safe_types = null W.access += get_centcom_access("Special Ops Officer") W.assignment = "Special Ops Officer" W.registered_name = M.real_name - M.equip_to_slot_or_qdel(W, slot_wear_id) + M.equip_to_slot_or_del(W, slot_wear_id) if("blue wizard") - M.equip_to_slot_or_qdel(new /obj/item/clothing/under/lightpurple(M), slot_w_uniform) - M.equip_to_slot_or_qdel(new /obj/item/clothing/suit/wizrobe(M), slot_wear_suit) - M.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/sandal(M), slot_shoes) - M.equip_to_slot_or_qdel(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_qdel(new /obj/item/clothing/head/wizard(M), slot_head) - M.equip_to_slot_or_qdel(new /obj/item/weapon/teleportation_scroll(M), slot_r_store) - M.equip_to_slot_or_qdel(new /obj/item/weapon/spellbook(M), slot_r_hand) - M.equip_to_slot_or_qdel(new /obj/item/weapon/staff(M), slot_l_hand) - M.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack(M), slot_back) - M.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box(M), slot_in_backpack) + M.equip_to_slot_or_del(new /obj/item/clothing/under/lightpurple(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(M), slot_wear_suit) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(M), slot_head) + M.equip_to_slot_or_del(new /obj/item/weapon/teleportation_scroll(M), slot_r_store) + M.equip_to_slot_or_del(new /obj/item/weapon/spellbook(M), slot_r_hand) + M.equip_to_slot_or_del(new /obj/item/weapon/staff(M), slot_l_hand) + M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(M), slot_back) + M.equip_to_slot_or_del(new /obj/item/weapon/storage/box(M), slot_in_backpack) if("red wizard") - M.equip_to_slot_or_qdel(new /obj/item/clothing/under/lightpurple(M), slot_w_uniform) - M.equip_to_slot_or_qdel(new /obj/item/clothing/suit/wizrobe/red(M), slot_wear_suit) - M.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/sandal(M), slot_shoes) - M.equip_to_slot_or_qdel(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_qdel(new /obj/item/clothing/head/wizard/red(M), slot_head) - M.equip_to_slot_or_qdel(new /obj/item/weapon/teleportation_scroll(M), slot_r_store) - M.equip_to_slot_or_qdel(new /obj/item/weapon/spellbook(M), slot_r_hand) - M.equip_to_slot_or_qdel(new /obj/item/weapon/staff(M), slot_l_hand) - M.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack(M), slot_back) - M.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box(M), slot_in_backpack) + M.equip_to_slot_or_del(new /obj/item/clothing/under/lightpurple(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/red(M), slot_wear_suit) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/red(M), slot_head) + M.equip_to_slot_or_del(new /obj/item/weapon/teleportation_scroll(M), slot_r_store) + M.equip_to_slot_or_del(new /obj/item/weapon/spellbook(M), slot_r_hand) + M.equip_to_slot_or_del(new /obj/item/weapon/staff(M), slot_l_hand) + M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(M), slot_back) + M.equip_to_slot_or_del(new /obj/item/weapon/storage/box(M), slot_in_backpack) if("marisa wizard") - M.equip_to_slot_or_qdel(new /obj/item/clothing/under/lightpurple(M), slot_w_uniform) - M.equip_to_slot_or_qdel(new /obj/item/clothing/suit/wizrobe/marisa(M), slot_wear_suit) - M.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/sandal/marisa(M), slot_shoes) - M.equip_to_slot_or_qdel(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_qdel(new /obj/item/clothing/head/wizard/marisa(M), slot_head) - M.equip_to_slot_or_qdel(new /obj/item/weapon/teleportation_scroll(M), slot_r_store) - M.equip_to_slot_or_qdel(new /obj/item/weapon/spellbook(M), slot_r_hand) - M.equip_to_slot_or_qdel(new /obj/item/weapon/staff(M), slot_l_hand) - M.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack(M), slot_back) - M.equip_to_slot_or_qdel(new /obj/item/weapon/storage/box(M), slot_in_backpack) + M.equip_to_slot_or_del(new /obj/item/clothing/under/lightpurple(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/marisa(M), slot_wear_suit) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal/marisa(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/marisa(M), slot_head) + M.equip_to_slot_or_del(new /obj/item/weapon/teleportation_scroll(M), slot_r_store) + M.equip_to_slot_or_del(new /obj/item/weapon/spellbook(M), slot_r_hand) + M.equip_to_slot_or_del(new /obj/item/weapon/staff(M), slot_l_hand) + M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(M), slot_back) + M.equip_to_slot_or_del(new /obj/item/weapon/storage/box(M), slot_in_backpack) if("soviet admiral") - M.equip_to_slot_or_qdel(new /obj/item/clothing/head/hgpiratecap(M), slot_head) - M.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/swat/combat(M), slot_shoes) - M.equip_to_slot_or_qdel(new /obj/item/clothing/gloves/combat(M), slot_gloves) - M.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/headset_cent(M), slot_ears) - M.equip_to_slot_or_qdel(new /obj/item/clothing/glasses/thermal/eyepatch(M), slot_glasses) - M.equip_to_slot_or_qdel(new /obj/item/clothing/suit/hgpirate(M), slot_wear_suit) - M.equip_to_slot_or_qdel(new /obj/item/weapon/storage/backpack/satchel(M), slot_back) - M.equip_to_slot_or_qdel(new /obj/item/weapon/gun/projectile/revolver/mateba(M), slot_belt) - M.equip_to_slot_or_qdel(new /obj/item/clothing/under/soviet(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/head/hgpiratecap(M), slot_head) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/swat/combat(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_cent(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/eyepatch(M), slot_glasses) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/hgpirate(M), slot_wear_suit) + M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(M), slot_back) + M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/revolver/mateba(M), slot_belt) + M.equip_to_slot_or_del(new /obj/item/clothing/under/soviet(M), slot_w_uniform) var/obj/item/weapon/card/id/W = new(M) W.name = "[M.real_name]'s ID Card (Admiral)" W.icon_state = "centcom" @@ -1016,20 +1016,20 @@ var/global/list/g_fancy_list_of_safe_types = null W.access += get_centcom_access("Admiral") W.assignment = "Admiral" W.registered_name = M.real_name - M.equip_to_slot_or_qdel(W, slot_wear_id) + M.equip_to_slot_or_del(W, slot_wear_id) if("mobster") - M.equip_to_slot_or_qdel(new /obj/item/clothing/head/fedora(M), slot_head) - M.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/laceup(M), slot_shoes) - M.equip_to_slot_or_qdel(new /obj/item/clothing/gloves/black(M), slot_gloves) - M.equip_to_slot_or_qdel(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_qdel(new /obj/item/clothing/glasses/sunglasses(M), slot_glasses) - M.equip_to_slot_or_qdel(new /obj/item/weapon/gun/projectile/automatic/tommygun(M), slot_r_hand) - M.equip_to_slot_or_qdel(new /obj/item/clothing/under/suit_jacket/really_black(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/head/fedora(M), slot_head) + M.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(M), slot_shoes) + M.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(M), slot_gloves) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(M), slot_glasses) + M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/automatic/tommygun(M), slot_r_hand) + M.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/really_black(M), slot_w_uniform) var/obj/item/weapon/card/id/W = new(M) W.name = "[M.real_name]'s ID Card" W.assignment = "Assistant" W.registered_name = M.real_name - M.equip_to_slot_or_qdel(W, slot_wear_id) + M.equip_to_slot_or_del(W, slot_wear_id) M.regenerate_icons() diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm index c79d3117e21..1a3d1ea3748 100644 --- a/code/modules/admin/verbs/onlyone.dm +++ b/code/modules/admin/verbs/onlyone.dm @@ -30,12 +30,12 @@ continue qdel(I) - H.equip_to_slot_or_qdel(new /obj/item/clothing/under/kilt(H), slot_w_uniform) - H.equip_to_slot_or_qdel(new /obj/item/device/radio/headset/heads/captain(H), slot_ears) - H.equip_to_slot_or_qdel(new /obj/item/clothing/head/beret(H), slot_head) - H.equip_to_slot_or_qdel(new /obj/item/weapon/claymore(H), slot_l_hand) - H.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/swat/combat(H), slot_shoes) - H.equip_to_slot_or_qdel(new /obj/item/weapon/pinpointer(H.loc), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/clothing/under/kilt(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/clothing/head/beret(H), slot_head) + H.equip_to_slot_or_del(new /obj/item/weapon/claymore(H), slot_l_hand) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/swat/combat(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/weapon/pinpointer(H.loc), slot_l_store) var/obj/item/weapon/card/id/W = new(H) W.name = "[H.real_name]'s ID Card" @@ -44,7 +44,7 @@ W.access += get_all_centcom_access() W.assignment = "Highlander" W.registered_name = H.real_name - H.equip_to_slot_or_qdel(W, slot_wear_id) + H.equip_to_slot_or_del(W, slot_wear_id) message_admins("\blue [key_name_admin(usr)] used THERE CAN BE ONLY ONE!", 1) log_admin("[key_name(usr)] used there can be only one.") \ No newline at end of file diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 8dc9d9d9b3a..71c8b782a3b 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -41,29 +41,29 @@ M.adjustBruteLoss(src.corpsebrute) M.adjustOxyLoss(src.corpseoxy) if(src.corpseuniform) - M.equip_to_slot_or_qdel(new src.corpseuniform(M), slot_w_uniform) + M.equip_to_slot_or_del(new src.corpseuniform(M), slot_w_uniform) if(src.corpsesuit) - M.equip_to_slot_or_qdel(new src.corpsesuit(M), slot_wear_suit) + M.equip_to_slot_or_del(new src.corpsesuit(M), slot_wear_suit) if(src.corpseshoes) - M.equip_to_slot_or_qdel(new src.corpseshoes(M), slot_shoes) + M.equip_to_slot_or_del(new src.corpseshoes(M), slot_shoes) if(src.corpsegloves) - M.equip_to_slot_or_qdel(new src.corpsegloves(M), slot_gloves) + M.equip_to_slot_or_del(new src.corpsegloves(M), slot_gloves) if(src.corpseradio) - M.equip_to_slot_or_qdel(new src.corpseradio(M), slot_ears) + M.equip_to_slot_or_del(new src.corpseradio(M), slot_ears) if(src.corpseglasses) - M.equip_to_slot_or_qdel(new src.corpseglasses(M), slot_glasses) + M.equip_to_slot_or_del(new src.corpseglasses(M), slot_glasses) if(src.corpsemask) - M.equip_to_slot_or_qdel(new src.corpsemask(M), slot_wear_mask) + M.equip_to_slot_or_del(new src.corpsemask(M), slot_wear_mask) if(src.corpsehelmet) - M.equip_to_slot_or_qdel(new src.corpsehelmet(M), slot_head) + M.equip_to_slot_or_del(new src.corpsehelmet(M), slot_head) if(src.corpsebelt) - M.equip_to_slot_or_qdel(new src.corpsebelt(M), slot_belt) + M.equip_to_slot_or_del(new src.corpsebelt(M), slot_belt) if(src.corpsepocket1) - M.equip_to_slot_or_qdel(new src.corpsepocket1(M), slot_r_store) + M.equip_to_slot_or_del(new src.corpsepocket1(M), slot_r_store) if(src.corpsepocket2) - M.equip_to_slot_or_qdel(new src.corpsepocket2(M), slot_l_store) + M.equip_to_slot_or_del(new src.corpsepocket2(M), slot_l_store) if(src.corpseback) - M.equip_to_slot_or_qdel(new src.corpseback(M), slot_back) + M.equip_to_slot_or_del(new src.corpseback(M), slot_back) if(src.corpseid == 1) var/obj/item/weapon/card/id/W = new(M) W.name = "[M.real_name]'s ID Card ([corpseidjob])" @@ -83,7 +83,7 @@ if(corpseidjob) W.assignment = corpseidjob W.registered_name = M.real_name - M.equip_to_slot_or_qdel(W, slot_wear_id) + M.equip_to_slot_or_del(W, slot_wear_id) qdel(src) /obj/effect/landmark/corpse/AICorpse/createCorpse() //Creates a corrupted AI diff --git a/code/modules/events/ninja.dm b/code/modules/events/ninja.dm index 9339f3b2d38..2cf66afd290 100644 --- a/code/modules/events/ninja.dm +++ b/code/modules/events/ninja.dm @@ -361,21 +361,21 @@ ________________________________________________________________________________ qdel(gloves) var/obj/item/device/radio/R = new /obj/item/device/radio/headset(src) - equip_to_slot_or_qdel(R, slot_ears) + equip_to_slot_or_del(R, slot_ears) if(gender==FEMALE) - equip_to_slot_or_qdel(new /obj/item/clothing/under/color/blackf(src), slot_w_uniform) + equip_to_slot_or_del(new /obj/item/clothing/under/color/blackf(src), slot_w_uniform) else - equip_to_slot_or_qdel(new /obj/item/clothing/under/color/black(src), slot_w_uniform) - equip_to_slot_or_qdel(new /obj/item/clothing/shoes/space_ninja(src), slot_shoes) - equip_to_slot_or_qdel(new /obj/item/clothing/suit/space/space_ninja(src), slot_wear_suit) - equip_to_slot_or_qdel(new /obj/item/clothing/gloves/space_ninja(src), slot_gloves) - equip_to_slot_or_qdel(new /obj/item/clothing/head/helmet/space/space_ninja(src), slot_head) - equip_to_slot_or_qdel(new /obj/item/clothing/mask/gas/voice/space_ninja(src), slot_wear_mask) - equip_to_slot_or_qdel(new /obj/item/device/flashlight(src), slot_belt) - equip_to_slot_or_qdel(new /obj/item/weapon/plastique(src), slot_r_store) - equip_to_slot_or_qdel(new /obj/item/weapon/plastique(src), slot_l_store) - equip_to_slot_or_qdel(new /obj/item/weapon/tank/emergency_oxygen(src), slot_s_store) - equip_to_slot_or_qdel(new /obj/item/weapon/tank/jetpack/carbondioxide(src), slot_back) + equip_to_slot_or_del(new /obj/item/clothing/under/color/black(src), slot_w_uniform) + equip_to_slot_or_del(new /obj/item/clothing/shoes/space_ninja(src), slot_shoes) + equip_to_slot_or_del(new /obj/item/clothing/suit/space/space_ninja(src), slot_wear_suit) + equip_to_slot_or_del(new /obj/item/clothing/gloves/space_ninja(src), slot_gloves) + equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/space_ninja(src), slot_head) + equip_to_slot_or_del(new /obj/item/clothing/mask/gas/voice/space_ninja(src), slot_wear_mask) + equip_to_slot_or_del(new /obj/item/device/flashlight(src), slot_belt) + equip_to_slot_or_del(new /obj/item/weapon/plastique(src), slot_r_store) + equip_to_slot_or_del(new /obj/item/weapon/plastique(src), slot_l_store) + equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen(src), slot_s_store) + equip_to_slot_or_del(new /obj/item/weapon/tank/jetpack/carbondioxide(src), slot_back) var/obj/item/weapon/implant/explosive/E = new/obj/item/weapon/implant/explosive(src) E.imp_in = src diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm index f0cfd8df268..d8ed0f5b74b 100644 --- a/code/modules/mob/living/carbon/metroid/metroid.dm +++ b/code/modules/mob/living/carbon/metroid/metroid.dm @@ -916,12 +916,12 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75 if(prob(50)) G.gender = "female" hardset_dna(G, null, null, null, "adamantine") G.real_name = text("Adamantine Golem ([rand(1, 1000)])") - G.equip_to_slot_or_qdel(new /obj/item/clothing/under/golem(G), slot_w_uniform) - G.equip_to_slot_or_qdel(new /obj/item/clothing/suit/golem(G), slot_wear_suit) - G.equip_to_slot_or_qdel(new /obj/item/clothing/shoes/golem(G), slot_shoes) - G.equip_to_slot_or_qdel(new /obj/item/clothing/mask/breath/golem(G), slot_wear_mask) - G.equip_to_slot_or_qdel(new /obj/item/clothing/gloves/golem(G), slot_gloves) - //G.equip_to_slot_or_qdel(new /obj/item/clothing/head/space/golem(G), slot_head) + G.equip_to_slot_or_del(new /obj/item/clothing/under/golem(G), slot_w_uniform) + G.equip_to_slot_or_del(new /obj/item/clothing/suit/golem(G), slot_wear_suit) + G.equip_to_slot_or_del(new /obj/item/clothing/shoes/golem(G), slot_shoes) + G.equip_to_slot_or_del(new /obj/item/clothing/mask/breath/golem(G), slot_wear_mask) + G.equip_to_slot_or_del(new /obj/item/clothing/gloves/golem(G), slot_gloves) + //G.equip_to_slot_or_del(new /obj/item/clothing/head/space/golem(G), slot_head) G.loc = src.loc G.key = ghost.key G << "You are an adamantine golem. You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools. Serve [user], and assist them in completing their goals at any cost." diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm index c94683f4672..25f65ee9990 100644 --- a/code/modules/mob/living/simple_animal/corpse.dm +++ b/code/modules/mob/living/simple_animal/corpse.dm @@ -35,29 +35,29 @@ M.real_name = src.name M.stat = 2 //Kills the new mob if(src.corpseuniform) - M.equip_to_slot_or_qdel(new src.corpseuniform(M), slot_w_uniform) + M.equip_to_slot_or_del(new src.corpseuniform(M), slot_w_uniform) if(src.corpsesuit) - M.equip_to_slot_or_qdel(new src.corpsesuit(M), slot_wear_suit) + M.equip_to_slot_or_del(new src.corpsesuit(M), slot_wear_suit) if(src.corpseshoes) - M.equip_to_slot_or_qdel(new src.corpseshoes(M), slot_shoes) + M.equip_to_slot_or_del(new src.corpseshoes(M), slot_shoes) if(src.corpsegloves) - M.equip_to_slot_or_qdel(new src.corpsegloves(M), slot_gloves) + M.equip_to_slot_or_del(new src.corpsegloves(M), slot_gloves) if(src.corpseradio) - M.equip_to_slot_or_qdel(new src.corpseradio(M), slot_ears) + M.equip_to_slot_or_del(new src.corpseradio(M), slot_ears) if(src.corpseglasses) - M.equip_to_slot_or_qdel(new src.corpseglasses(M), slot_glasses) + M.equip_to_slot_or_del(new src.corpseglasses(M), slot_glasses) if(src.corpsemask) - M.equip_to_slot_or_qdel(new src.corpsemask(M), slot_wear_mask) + M.equip_to_slot_or_del(new src.corpsemask(M), slot_wear_mask) if(src.corpsehelmet) - M.equip_to_slot_or_qdel(new src.corpsehelmet(M), slot_head) + M.equip_to_slot_or_del(new src.corpsehelmet(M), slot_head) if(src.corpsebelt) - M.equip_to_slot_or_qdel(new src.corpsebelt(M), slot_belt) + M.equip_to_slot_or_del(new src.corpsebelt(M), slot_belt) if(src.corpsepocket1) - M.equip_to_slot_or_qdel(new src.corpsepocket1(M), slot_r_store) + M.equip_to_slot_or_del(new src.corpsepocket1(M), slot_r_store) if(src.corpsepocket2) - M.equip_to_slot_or_qdel(new src.corpsepocket2(M), slot_l_store) + M.equip_to_slot_or_del(new src.corpsepocket2(M), slot_l_store) if(src.corpseback) - M.equip_to_slot_or_qdel(new src.corpseback(M), slot_back) + M.equip_to_slot_or_del(new src.corpseback(M), slot_back) if(src.corpseid == 1) var/obj/item/weapon/card/id/W = new(M) W.name = "[M.real_name]'s ID Card" @@ -77,7 +77,7 @@ if(corpseidjob) W.assignment = corpseidjob W.registered_name = M.real_name - M.equip_to_slot_or_qdel(W, slot_wear_id) + M.equip_to_slot_or_del(W, slot_wear_id) qdel(src) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 361aef49c94..b4c410aedb9 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -172,7 +172,7 @@ var/next_mob_id = 0 return 0 //This is a SAFE proc. Use this instead of equip_to_splot()! -//set del_on_fail to have it delete W if it fails to equip +//set qdel_on_fail to have it delete W if it fails to equip //set disable_warning to disable the 'you are unable to equip that' warning. //unset redraw_mob to prevent the mob from being redrawn at the end. /mob/proc/equip_to_slot_if_possible(obj/item/W as obj, slot, qdel_on_fail = 0, disable_warning = 0, redraw_mob = 1) @@ -182,7 +182,7 @@ var/next_mob_id = 0 qdel(W) else if(!disable_warning) - src << "\red You are unable to equip that." //Only print if del_on_fail is false + src << "\red You are unable to equip that." //Only print if qdel_on_fail is false return 0 equip_to_slot(W, slot, redraw_mob) //This proc should not ever fail. return 1 @@ -193,7 +193,7 @@ var/next_mob_id = 0 return //This is just a commonly used configuration for the equip_to_slot_if_possible() proc, used to equip people when the rounds tarts and when events happen and such. -/mob/proc/equip_to_slot_or_qdel(obj/item/W as obj, slot) +/mob/proc/equip_to_slot_or_del(obj/item/W as obj, slot) equip_to_slot_if_possible(W, slot, 1, 1, 0) //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.