From 28ee8bec1b75b664d3832a1e86c61e45bb7f8972 Mon Sep 17 00:00:00 2001 From: "morikou@gmail.com" Date: Fri, 18 Feb 2011 18:16:33 +0000 Subject: [PATCH] Tweaks: - Paralysis Penlight now 3 telecrystals. - Added some (commented out) code that CAN fix a Mind Swap bug but I have no way to test it (hence it's commented out). - Fixed some more R&D bugs. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1065 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/gamemodes/wizard/spells.dm | 5 +++++ code/game/objects/devices/PDA/uplink.dm | 6 +++--- code/game/research/designs.dm | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/wizard/spells.dm b/code/game/gamemodes/wizard/spells.dm index 9fee0a8ab01..c0c08b06a58 100644 --- a/code/game/gamemodes/wizard/spells.dm +++ b/code/game/gamemodes/wizard/spells.dm @@ -681,6 +681,11 @@ spawn(500) H << "The mind transfer has robbed you of a spell." + /* //This code SHOULD work to prevent Mind Swap spam since the spell transfer code above instantly resets it. + //I can't test this code because I can't test mind stuff on my own :x -- Darem. + if(hascall(H, /mob/proc/swap)) + H.verbs -= /mob/proc/swap + */ G.client.mob = U U.mind = G.mind if(U.mind.special_verbs.len)//Basic fix to swap verbs for any mob if needed. diff --git a/code/game/objects/devices/PDA/uplink.dm b/code/game/objects/devices/PDA/uplink.dm index 2b505a1c875..61f99a59e4b 100644 --- a/code/game/objects/devices/PDA/uplink.dm +++ b/code/game/objects/devices/PDA/uplink.dm @@ -40,7 +40,7 @@ src.menu_message += "Electromagnet Card (3)
" src.menu_message += "Freedom Implant (with injector) (3)
" src.menu_message += "Sleepy Pen (5)
" - src.menu_message += "Paralysis Pen (2)
" + src.menu_message += "Paralysis Pen (3)
" src.menu_message += "Cloaking Device (4)
" src.menu_message += "Energy Sword (4)
" src.menu_message += "Plastic Explosives (4)
" @@ -115,8 +115,8 @@ src.uses -= 5 new /obj/item/weapon/pen/sleepypen(get_turf(src.hostpda)) if("paralysispen") - if (src.uses >= 2) - src.uses -= 2 + if (src.uses >= 3) + src.uses -= 3 new /obj/item/device/flashlight/pen/paralysis(get_turf(src.hostpda)) if("projector") if (src.uses >= 4) diff --git a/code/game/research/designs.dm b/code/game/research/designs.dm index 364a36fd708..9744117203e 100644 --- a/code/game/research/designs.dm +++ b/code/game/research/designs.dm @@ -199,7 +199,7 @@ datum req_tech = list("programming" = 2) build_type = IMPRINTER materials = list("$glass" = 2000, "acid" = 20) - build_path = "/obj/machinery/power/monitor" + build_path = "/obj/item/weapon/circuitboard/powermonitor" prisonmanage name = "Circuit Design (Prisoner Management Console)"