From b86d90c6c22fa46a048faaa19f1e7989f1a092c1 Mon Sep 17 00:00:00 2001 From: "johnsonmt88@gmail.com" Date: Wed, 14 Nov 2012 01:17:40 +0000 Subject: [PATCH] Couple of bugfixes: Wizards can no longer cast spells when muzzled. Fixes issue 843. You can no longer take bags of holding or mechs to the clown planet. Fixes issue 1061. Removed the infared sensor from the autolathe construct list. Fixes issue 1092. - The infared sensor already does nothing, the code for it seems to have been removed ages ago, so there's no harm in doing this. - Commenting out the define caused a few problems that I couldn't quite figure out. I'll leave it for now with a warning. Removed the ability for pAI's to set arrest status. Dead players really shouldn't be allowed to grief people like that. Fixes issue 1093. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5060 316c924e-a436-60f5-8080-3fe189b3f50e --- code/datums/helper_datums/teleport.dm | 14 +++++++++++++- code/datums/spell.dm | 5 +++++ code/defines/obj.dm | 9 +++++++++ code/game/machinery/autolathe.dm | 1 - code/modules/mob/living/silicon/pai/software.dm | 2 +- html/changelog.html | 5 +++++ 6 files changed, 33 insertions(+), 3 deletions(-) diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm index 1f353e3e72..cb67c3f5f1 100644 --- a/code/datums/helper_datums/teleport.dm +++ b/code/datums/helper_datums/teleport.dm @@ -161,6 +161,7 @@ if(istype(teleatom, /obj/item/weapon/disk/nuclear)) // Don't let nuke disks get teleported --NeoFite teleatom.visible_message("\red The [teleatom] bounces off of the portal!") return 0 + if(!isemptylist(teleatom.search_contents_for(/obj/item/weapon/disk/nuclear))) if(istype(teleatom, /mob/living)) var/mob/living/MM = teleatom @@ -168,6 +169,17 @@ else teleatom.visible_message("\red The [teleatom] bounces off of the portal!") return 0 - if(destination.z > 7) + + if(destination.z == 2) //centcomm z-level + if(istype(teleatom, /obj/mecha)) + var/obj/mecha/MM = teleatom + MM.occupant << "\red The mech would not survive the jump to a location so far away!" + return 0 + if(!isemptylist(teleatom.search_contents_for(/obj/item/weapon/storage/backpack/holding))) + teleatom.visible_message("\red The Bag of Holding bounces off of the portal!") + return 0 + + + if(destination.z > 7) //Away mission z-levels return 0 return 1 \ No newline at end of file diff --git a/code/datums/spell.dm b/code/datums/spell.dm index fcd9fa6026..86396e8dff 100644 --- a/code/datums/spell.dm +++ b/code/datums/spell.dm @@ -64,6 +64,11 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin usr << "Not when you're incapacitated." return 0 + if(ishuman(usr) || ismonkey(usr)) + if(istype(usr.wear_mask, /obj/item/clothing/mask/muzzle)) + usr << "Mmmf mrrfff!" + return 0 + if(clothes_req) //clothes check if(!istype(usr, /mob/living/carbon/human)) usr << "You aren't a human, Why are you trying to cast a human spell, silly non-human? Casting human spells is for humans." diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 64db183929..4d0f402620 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -47,6 +47,11 @@ //This list tracks characters spawned in the world and cannot be modified in-game. Currently referenced by respawn_character(). var/locked[] = list() + + +/* + * This item is completely unused, but removing it will break something in R&D and Radio code causing PDA and Ninja code to fail on compile + */ /obj/item/device/infra_sensor name = "Infrared Sensor" desc = "Scans for infrared beams in the vicinity." @@ -56,6 +61,10 @@ item_state = "electronic" m_amt = 150 origin_tech = "magnets=2" +/* + * + */ + /obj/effect/laser diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index c08ff595eb..5d31104e11 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -33,7 +33,6 @@ var/global/list/autolathe_recipes = list( \ new /obj/item/ammo_magazine/c38(), \ new /obj/item/device/taperecorder(), \ new /obj/item/device/assembly/igniter(), \ - new /obj/item/device/infra_sensor(), \ new /obj/item/device/assembly/signaler(), \ new /obj/item/device/radio/headset(), \ new /obj/item/device/radio(), \ diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm index 475b6df89d..139d65765b 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -461,7 +461,7 @@ else dat += "
Requested security record not found,

" if ((istype(src.securityActive2, /datum/data/record) && data_core.security.Find(src.securityActive2))) - dat += text("
\nSecurity Data
\nCriminal Status: []
\n
\nMinor Crimes: []
\nDetails: []
\n
\nMajor Crimes: []
\nDetails: []
\n
\nImportant Notes:
\n\t[]
\n
\n
Comments/Log

", src, src.securityActive2.fields["criminal"], src, src.securityActive2.fields["mi_crim"], src, src.securityActive2.fields["mi_crim_d"], src, src.securityActive2.fields["ma_crim"], src, src.securityActive2.fields["ma_crim_d"], src, src.securityActive2.fields["notes"]) + dat += text("
\nSecurity Data
\nCriminal Status: []
\n
\nMinor Crimes: []
\nDetails: []
\n
\nMajor Crimes: []
\nDetails: []
\n
\nImportant Notes:
\n\t[]
\n
\n
Comments/Log

", src.securityActive2.fields["criminal"], src, src.securityActive2.fields["mi_crim"], src, src.securityActive2.fields["mi_crim_d"], src, src.securityActive2.fields["ma_crim"], src, src.securityActive2.fields["ma_crim_d"], src, src.securityActive2.fields["notes"]) else dat += "
Requested security record not found,

" dat += text("
\nBack
", src) diff --git a/html/changelog.html b/html/changelog.html index 3911ee441b..5a0fafd3d8 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -58,6 +58,11 @@ should be listed in the changelog upon commit tho. Thanks. -->
  • You can now remove symptoms from a disease using synaptizine.
  • Kor: You can once again debrain changelings. They won't make anyone half-lings though, and you won't be able to tell if the body of a debrained changeling is a changeling by putting a player brain in there.
    • +

    Nodrak updated:

    +