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.
This commit is contained in:
SkyMarshal
2012-02-02 19:59:15 -07:00
parent 0e15736ba9
commit a2237a10dc
4 changed files with 13 additions and 4 deletions

View File

@@ -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/items // List of items
var/list/ItemList // Parsed list of items var/list/ItemList // Parsed list of items
var/uses // Numbers of crystals var/uses // Numbers of crystals
// List of items not to shove in their hands.
var/list/NotInHand = list(/obj/machinery/singularity_beacon/syndicate)
New() New()
welcome = ticker.mode.uplink_welcome 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]<BR>" src.menu_message += "Tele-Crystals left: [src.uses]<BR>"
src.menu_message += "<HR>" src.menu_message += "<HR>"
src.menu_message += "<B>Request item:</B><BR>" src.menu_message += "<B>Request item:</B><BR>"
src.menu_message += "<I>Each item costs a number of tele-crystals as indicated by the number following their name.</I><BR>" src.menu_message += "<I>Each item costs a number of tele-crystals as indicated by the number following their name.</I><br><BR>"
var/cost var/cost
var/item 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/path_obj = text2path(href_list["buy_item"])
var/mob/A = src.hostpda.loc var/mob/A = src.hostpda.loc
var/item = new path_obj(get_turf(src.hostpda)) 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) if(!A.r_hand)
item:loc = A item:loc = A
A.r_hand = item 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 item:loc = A
A.l_hand = item A.l_hand = item
item:layer = 20 item:layer = 20
else
item:loc = get_turf(A)
usr.update_clothing() usr.update_clothing()
// usr.client.onBought("[item:name]") When we have the stats again, uncomment. // 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 /* 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/path_obj = text2path(href_list["buy_item"])
var/item = new path_obj(get_turf(src.loc)) var/item = new path_obj(get_turf(src.loc))
var/mob/A = 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) if(!A.r_hand)
item:loc = A item:loc = A
A.r_hand = item 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 item:loc = A
A.l_hand = item A.l_hand = item
item:layer = 20 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 /* if(istype(item, /obj/spawner)) // Spawners need to have del called on them to avoid leaving a marker behind
del item*/ del item*/
// usr.client.onBought("[item:name]") When we have the stats again, uncomment. // usr.client.onBought("[item:name]") When we have the stats again, uncomment.

View File

@@ -195,6 +195,6 @@
meatslab.loc = src.loc meatslab.loc = src.loc
meatslab.throw_at(Tx,i,3) meatslab.throw_at(Tx,i,3)
if (!Tx.density) 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 src.operating = 0
update_icon() update_icon()

View File

@@ -357,6 +357,9 @@ CIRCULAR SAW
/obj/item/weapon/autopsy_scanner/verb/print_data() /obj/item/weapon/autopsy_scanner/verb/print_data()
set src in view(usr, 1) set src in view(usr, 1)
if(usr.stat == 2)
src << "No."
return
var/scan_data = "" var/scan_data = ""
var/n = 1 var/n = 1

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 42 KiB