From f8aaa0104f7aebc0f18f12e9a27172bcbd66c2c7 Mon Sep 17 00:00:00 2001 From: "Kortgstation@gmail.com" Date: Tue, 9 Oct 2012 01:37:15 +0000 Subject: [PATCH] Pens no longer spawn in your pocket, rather a pen will spawn in your PDA. Updated the changelog. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4835 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/jobs/job_controller.dm | 4 ++-- code/game/objects/items/devices/PDA/PDA.dm | 3 +++ html/changelog.html | 5 +++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index fead4e60149..3201999c446 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -364,10 +364,10 @@ var/global/datum/controller/occupations/job_master C.name = "[C.registered_name]'s ID Card ([C.assignment])" C.access = get_access(C.assignment) H.equip_to_slot_or_del(C, slot_wear_id) - if(prob(50)) + /* if(prob(50)) H.equip_to_slot_or_del(new /obj/item/weapon/pen(H), slot_r_store) else - 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/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) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 3785c017862..89be98f2f8a 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -43,6 +43,9 @@ var/global/list/obj/item/device/pda/PDAs = list() var/obj/item/device/paicard/pai = null // A slot for a personal AI device +/obj/item/device/pda/New() + new /obj/item/weapon/pen(src) + /obj/item/device/pda/medical default_cartridge = /obj/item/weapon/cartridge/medical icon_state = "pda-m" diff --git a/html/changelog.html b/html/changelog.html index eca2accc3c2..68ae98d9f54 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -55,6 +55,11 @@ should be listed in the changelog upon commit tho. Thanks. -->
  • Thanks to Skasi. Atmospherics has been changed to be made simpler and spawn with the new atmos features, such as the heaters.
  • Radio headsets can only be heard by people wearing them on their ear slot. This will let us do more fun stuff with headsets, such as a traitor encryption key which can listen to all the channels, but not talk in them.
    • + +

    Kor updated:

    +