From a2237a10dcd0f75e7fb8266c3d820bbfd2d2091d Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Thu, 2 Feb 2012 19:59:15 -0700 Subject: [PATCH] Fixes for singularity beacon glitching further gibber fix. Ghosts can no longer print autopsy reports Shrunk evidence bags so they can be put in lockers. --- code/WorkInProgress/Ported/Abi79/uplinks.dm | 12 +++++++++--- code/game/machinery/kitchen/gibber.dm | 2 +- .../objects/items/weapons/surgery_tools.dm | 3 +++ icons/obj/storage.dmi | Bin 43455 -> 43449 bytes 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/code/WorkInProgress/Ported/Abi79/uplinks.dm b/code/WorkInProgress/Ported/Abi79/uplinks.dm index b7672b120c..b6bcefe1f8 100644 --- a/code/WorkInProgress/Ported/Abi79/uplinks.dm +++ b/code/WorkInProgress/Ported/Abi79/uplinks.dm @@ -21,6 +21,8 @@ A list of items and costs is stored under the datum of every game mode, alongsid var/items // List of items var/list/ItemList // Parsed list of items var/uses // Numbers of crystals + // List of items not to shove in their hands. + var/list/NotInHand = list(/obj/machinery/singularity_beacon/syndicate) New() welcome = ticker.mode.uplink_welcome @@ -34,7 +36,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid src.menu_message += "Tele-Crystals left: [src.uses]
" src.menu_message += "
" src.menu_message += "Request item:
" - src.menu_message += "Each item costs a number of tele-crystals as indicated by the number following their name.
" + src.menu_message += "Each item costs a number of tele-crystals as indicated by the number following their name.

" var/cost var/item @@ -158,7 +160,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid var/path_obj = text2path(href_list["buy_item"]) var/mob/A = src.hostpda.loc var/item = new path_obj(get_turf(src.hostpda)) - if(ismob(A)) //&& !istype(item, /obj/spawner)) + if(ismob(A) && !(locate(item) in NotInHand)) //&& !istype(item, /obj/spawner)) if(!A.r_hand) item:loc = A A.r_hand = item @@ -167,6 +169,8 @@ A list of items and costs is stored under the datum of every game mode, alongsid item:loc = A A.l_hand = item item:layer = 20 + else + item:loc = get_turf(A) usr.update_clothing() // usr.client.onBought("[item:name]") When we have the stats again, uncomment. /* if(istype(item, /obj/spawner)) // Spawners need to have del called on them to avoid leaving a marker behind @@ -237,7 +241,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid var/path_obj = text2path(href_list["buy_item"]) var/item = new path_obj(get_turf(src.loc)) var/mob/A = src.loc - if(ismob(A)) //&& !istype(item, /obj/spawner)) + if(ismob(A) && !(locate(item) in NotInHand)) //&& !istype(item, /obj/spawner)) if(!A.r_hand) item:loc = A A.r_hand = item @@ -246,6 +250,8 @@ A list of items and costs is stored under the datum of every game mode, alongsid item:loc = A A.l_hand = item item:layer = 20 + else + item:loc = get_turf(A) /* if(istype(item, /obj/spawner)) // Spawners need to have del called on them to avoid leaving a marker behind del item*/ // usr.client.onBought("[item:name]") When we have the stats again, uncomment. diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm index fb144b3e56..9d4df00bd9 100644 --- a/code/game/machinery/kitchen/gibber.dm +++ b/code/game/machinery/kitchen/gibber.dm @@ -195,6 +195,6 @@ meatslab.loc = src.loc meatslab.throw_at(Tx,i,3) if (!Tx.density) - new /obj/effect/decal/cleanable/blood/gibs(Tx,i) + new /obj/effect/decal/cleanable/blood/gibs(Tx,i - iterator) src.operating = 0 update_icon() diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index 14838b1ef7..bedcbf3f3d 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -357,6 +357,9 @@ CIRCULAR SAW /obj/item/weapon/autopsy_scanner/verb/print_data() set src in view(usr, 1) + if(usr.stat == 2) + src << "No." + return var/scan_data = "" var/n = 1 diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 5c668e9508d04a7470f797e4359584284bf0ea2f..079a6c280a1e961464865f9900fda1f41e0311a5 100644 GIT binary patch delta 3391 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 Vn52O?06zc#002ovPDHLkV1lt$Q|bT! delta 3397 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 bA&UP4{>a$Io>B@k00000NkvXXu0mjfW*}~A