diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 337f4407bf7..ed4cd490aa6 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -81,7 +81,7 @@ if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back) if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) if(H.backbag == 4) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_chem(H), H.slot_back) - H.equip_if_possible(new /obj/item/device/radio/headset/headset_medsci(H), H.slot_ears) + H.equip_if_possible(new /obj/item/device/radio/headset/headset_med(H), H.slot_ears) H.equip_if_possible(new /obj/item/clothing/under/rank/chemist(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/white(H), H.slot_shoes) H.equip_if_possible(new /obj/item/device/pda/chemist(H), H.slot_belt) diff --git a/code/game/objects/closets/secure/cargo.dm b/code/game/objects/closets/secure/cargo.dm index a366ebf9ee2..638bc2ffd66 100644 --- a/code/game/objects/closets/secure/cargo.dm +++ b/code/game/objects/closets/secure/cargo.dm @@ -15,7 +15,7 @@ new /obj/item/clothing/shoes/black(src) new /obj/item/device/radio/headset/headset_cargo(src) new /obj/item/clothing/gloves/black(src) - new /obj/item/weapon/cartridge/quartermaster(src) +// new /obj/item/weapon/cartridge/quartermaster(src) return /obj/structure/closet/secure_closet/qm_personal diff --git a/code/game/objects/closets/secure/engineering.dm b/code/game/objects/closets/secure/engineering.dm index aed317be772..38c567421d3 100644 --- a/code/game/objects/closets/secure/engineering.dm +++ b/code/game/objects/closets/secure/engineering.dm @@ -118,7 +118,7 @@ new /obj/item/device/t_scanner(src) new /obj/item/weapon/storage/belt/utility/full(src) new /obj/item/weapon/storage/toolbox/mechanical(src) - new /obj/item/weapon/cartridge/engineering(src) +// new /obj/item/weapon/cartridge/engineering(src) new /obj/item/device/radio/headset/headset_eng(src) new /obj/item/clothing/suit/hazardvest(src) new /obj/item/clothing/mask/gas(src) diff --git a/code/game/objects/closets/secure/medical.dm b/code/game/objects/closets/secure/medical.dm index 49cb6f466e5..b9829af6ad4 100644 --- a/code/game/objects/closets/secure/medical.dm +++ b/code/game/objects/closets/secure/medical.dm @@ -86,7 +86,7 @@ new /obj/item/clothing/under/rank/medical/green(src) if ("purple") new /obj/item/clothing/under/rank/medical/purple(src) - new /obj/item/weapon/cartridge/medical(src) +// new /obj/item/weapon/cartridge/medical(src) new /obj/item/device/radio/headset/headset_med(src) return diff --git a/code/game/objects/closets/secure/security.dm b/code/game/objects/closets/secure/security.dm index c05e41d40eb..c8129152ed0 100644 --- a/code/game/objects/closets/secure/security.dm +++ b/code/game/objects/closets/secure/security.dm @@ -107,7 +107,7 @@ new /obj/item/device/flash(B) new /obj/item/device/pda/security(src) new /obj/item/clothing/suit/armor/vest(src) - new /obj/item/weapon/cartridge/security(src) +// new /obj/item/weapon/cartridge/security(src) new /obj/item/device/radio/headset/headset_sec(src) new /obj/item/weapon/storage/flashbang_kit(src) new /obj/item/weapon/melee/baton(src) @@ -140,7 +140,7 @@ new /obj/item/clothing/suit/armor/vest(src) new /obj/item/clothing/suit/storage/gearharness(src) new /obj/item/clothing/head/helmet(src) - new /obj/item/weapon/cartridge/security(src) +// new /obj/item/weapon/cartridge/security(src) new /obj/item/device/pda/security(src) new /obj/item/device/radio/headset/headset_sec(src) new /obj/item/weapon/storage/belt/security(src) diff --git a/code/game/objects/devices/PDA/PDA.dm b/code/game/objects/devices/PDA/PDA.dm index 38036fb027e..a5a60fea8eb 100755 --- a/code/game/objects/devices/PDA/PDA.dm +++ b/code/game/objects/devices/PDA/PDA.dm @@ -135,8 +135,6 @@ /obj/item/device/pda/roboticist icon_state = "pda-robot" - desc = "A portable microcomputer by Thinktronic Systems, LTD. This is model is a special edition with a transparent case." - note = "Congratulations, your station has chosen the Thinktronic 5230 Personal Data Assistant Deluxe Special Turbo Edition!" /obj/item/device/pda/librarian icon_state = "pda-libb" diff --git a/code/game/objects/devices/PDA/cart.dm b/code/game/objects/devices/PDA/cart.dm index 0c750fed264..712e1ed8b6d 100644 --- a/code/game/objects/devices/PDA/cart.dm +++ b/code/game/objects/devices/PDA/cart.dm @@ -40,6 +40,11 @@ icon_state = "cart-m" access_medical = 1 + chemistry + name = "ChemWhiz Cartridge" + icon_state = "cart-chem" + access_reagent_scanner = 1 + security name = "R.O.B.U.S.T. Cartridge" icon_state = "cart-s" @@ -89,7 +94,7 @@ name = "Signal Ace 2" desc = "Complete with integrated radio signaler!" icon_state = "cart-tox" - access_reagent_scanner = 1 +// access_reagent_scanner = 1 New() ..() @@ -152,7 +157,7 @@ name = "Signal Ace DELUXE" icon_state = "cart-rd" access_status_display = 1 - access_reagent_scanner = 1 +// access_reagent_scanner = 1 New() ..() diff --git a/icons/obj/pda.dmi b/icons/obj/pda.dmi index 4e51c0ff590..a3dea0e843d 100644 Binary files a/icons/obj/pda.dmi and b/icons/obj/pda.dmi differ