diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index 97daf562df9..a8846f2134a 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -33,7 +33,7 @@ H.equip_or_collect(new /obj/item/weapon/storage/belt/utility/full(H), slot_belt) H.equip_or_collect(new /obj/item/clothing/gloves/color/black/ce(H), slot_gloves) H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H), slot_in_backpack) return 1 @@ -125,5 +125,5 @@ H.equip_or_collect(new /obj/item/device/t_scanner(H), slot_r_store) H.equip_or_collect(new /obj/item/device/pda/engineering(H), slot_wear_pda) H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/pod_paint_bucket(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/pod_paint_bucket(H), slot_in_backpack) return 1 diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 0899c2af93a..1baceb6a57e 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -30,7 +30,7 @@ H.equip_or_collect(new /obj/item/weapon/storage/firstaid/adv(H), slot_l_hand) H.equip_or_collect(new /obj/item/device/flashlight/pen(H), slot_s_store) H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H), slot_in_backpack) return 1 @@ -62,10 +62,10 @@ H.equip_or_collect(new /obj/item/clothing/under/rank/medical/mortician(H), slot_w_uniform) H.equip_or_collect(new /obj/item/clothing/suit/storage/labcoat/mortician(H), slot_wear_suit) if(H.backbag != 1) - H.equip_or_collect(new /obj/item/clothing/head/surgery/black(H.back), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/autopsy_scanner(H.back), slot_in_backpack) - H.equip_or_collect(new /obj/item/device/mass_spectrometer(H.back), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/storage/box/bodybags(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/clothing/head/surgery/black(H), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/autopsy_scanner(H), slot_in_backpack) + H.equip_or_collect(new /obj/item/device/mass_spectrometer(H), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/storage/box/bodybags(H), slot_in_backpack) if("Surgeon") H.equip_or_collect(new /obj/item/clothing/under/rank/medical/blue(H), slot_w_uniform) H.equip_or_collect(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit) @@ -248,5 +248,5 @@ H.equip_or_collect(new /obj/item/clothing/head/soft/blue(H), slot_head) H.equip_or_collect(new /obj/item/device/flashlight/pen(H), slot_s_store) H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H), slot_in_backpack) - H.equip_or_collect(new /obj/item/device/healthanalyzer(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/device/healthanalyzer(H), slot_in_backpack) return 1 diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index 10c267be851..f03f5b4c0a1 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -36,7 +36,7 @@ H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/weapon/clipboard(H), slot_l_hand) H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H), slot_in_backpack) return 1 diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index a237411e80a..47532f8d081 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -35,7 +35,7 @@ H.equip_or_collect(new /obj/item/weapon/gun/energy/gun(H), slot_s_store) H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/restraints/handcuffs(H), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(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 @@ -123,7 +123,7 @@ H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/storage/box/evidence(H), slot_in_backpack) H.equip_or_collect(new /obj/item/device/detective_scanner(H), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(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/supervisor.dm b/code/game/jobs/job/supervisor.dm index be0215b9b22..66f0ddb2c65 100644 --- a/code/game/jobs/job/supervisor.dm +++ b/code/game/jobs/job/supervisor.dm @@ -30,8 +30,8 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) H.equip_or_collect(new /obj/item/clothing/shoes/brown(H), slot_shoes) H.equip_or_collect(new /obj/item/clothing/head/caphat(H), slot_head) H.equip_or_collect(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses) - H.equip_or_collect(new /obj/item/weapon/storage/box/ids(H.back), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/storage/box/ids(H), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(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 @@ -81,8 +81,8 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) H.equip_or_collect(new /obj/item/clothing/head/hopcap(H), slot_head) H.equip_or_collect(new /obj/item/clothing/shoes/brown(H), slot_shoes) H.equip_or_collect(new /obj/item/device/pda/heads/hop(H), slot_wear_pda) - H.equip_or_collect(new /obj/item/weapon/storage/box/ids(H.back), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/storage/box/ids(H), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) return 1 @@ -118,8 +118,8 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack(H), slot_back) if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) - H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/ntcane(H.back), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/lighter/zippo/nt_rep(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/ntcane(H), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/lighter/zippo/nt_rep(H), slot_in_backpack) H.equip_or_collect(new /obj/item/clothing/under/rank/ntrep(H), slot_w_uniform) H.equip_or_collect(new /obj/item/clothing/suit/storage/ntrep(H), slot_wear_suit) H.equip_or_collect(new /obj/item/clothing/shoes/centcom(H), slot_shoes) @@ -165,8 +165,8 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) H.equip_or_collect(new /obj/item/clothing/suit/armor/vest/blueshield(H), slot_wear_suit) H.equip_or_collect(new /obj/item/device/pda/heads/blueshield(H), slot_wear_pda) H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/storage/box/deathimp(H.back), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/gun/energy/gun/blueshield(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/storage/box/deathimp(H), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/gun/energy/gun/blueshield(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 @@ -205,7 +205,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) H.equip_or_collect(new /obj/item/clothing/head/powdered_wig(H), slot_head) H.equip_or_collect(new /obj/item/clothing/glasses/hud/security/sunglasses(H), slot_glasses) H.equip_or_collect(new /obj/item/device/pda/heads/magistrate(H), slot_wear_pda) - H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H), slot_in_backpack) H.equip_or_collect(new /obj/item/device/flash(H), slot_r_store) H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm index 755989a5112..1f475891103 100644 --- a/code/game/jobs/job/support.dm +++ b/code/game/jobs/job/support.dm @@ -25,7 +25,7 @@ H.equip_or_collect(new /obj/item/device/pda/bar(H), slot_wear_pda) H.equip_or_collect(new /obj/item/weapon/storage/belt/bandolier/full(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) - H.equip_or_collect(new /obj/item/toy/russian_revolver(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/toy/russian_revolver(H), slot_in_backpack) H.dna.SetSEState(SOBERBLOCK,1) H.mutations += SOBER @@ -185,8 +185,8 @@ H.equip_or_collect(new /obj/item/clothing/shoes/workboots(H), slot_shoes) H.equip_or_collect(new /obj/item/weapon/reagent_containers/food/pill/patch/styptic(H), slot_l_store) H.equip_or_collect(new /obj/item/device/flashlight/seclite(H), slot_r_store) - H.equip_or_collect(new /obj/item/weapon/mining_voucher(H.back), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/storage/bag/ore(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/mining_voucher(H), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/storage/bag/ore(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) return 1 @@ -360,6 +360,6 @@ H.equip_or_collect(new /obj/item/clothing/under/barber(H), slot_w_uniform) H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes) H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/storage/box/barber(H.back), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/storage/box/lip_stick(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/storage/box/barber(H), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/storage/box/lip_stick(H), slot_in_backpack) return 1 diff --git a/code/game/jobs/job/support_chaplain.dm b/code/game/jobs/job/support_chaplain.dm index 92aa3ed60d3..5904cd4b020 100644 --- a/code/game/jobs/job/support_chaplain.dm +++ b/code/game/jobs/job/support_chaplain.dm @@ -24,7 +24,7 @@ H.equip_or_collect(new /obj/item/device/pda/chaplain(H), slot_wear_pda) H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes) H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) - H.equip_or_collect(new /obj/item/device/camera/spooky(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/device/camera/spooky(H), slot_in_backpack) spawn(0) var/religion_name = "Christianity" var/new_religion = sanitize(copytext(input(H, "You are the crew services officer. Would you like to change your religion? Default is Christianity, in SPACE.", "Name change", religion_name),1,MAX_NAME_LEN)) diff --git a/icons/obj/tank.dmi b/icons/obj/tank.dmi index 66ad2ba488c..1154fe08e33 100644 Binary files a/icons/obj/tank.dmi and b/icons/obj/tank.dmi differ