Santa's toy bag!

Fixed some miscellaneous stuff to prevent round-start crashing.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2758 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
vageyenaman@gmail.com
2011-12-21 07:04:55 +00:00
parent 6ad42b9ec2
commit bbed525019
9 changed files with 815 additions and 775 deletions

View File

@@ -112,6 +112,14 @@
if (M.s_active == src.loc) if (M.s_active == src.loc)
if (M.client) if (M.client)
M.client.screen -= src M.client.screen -= src
if(istype(src.loc, /obj/item/weapon/storage/backpack/santabag))
if(src.loc.contents.len < 5)
src.loc.icon_state = "giftbag0"
else if(src.loc.contents.len >= 5 && src.loc.contents.len < 15)
src.loc.icon_state = "giftbag1"
else if(src.loc.contents.len >= 15)
src.loc.icon_state = "giftbag2"
src.throwing = 0 src.throwing = 0
if (src.loc == user) if (src.loc == user)
//canremove==0 means that object may not be removed. You can still wear it. This only applies to clothing. /N //canremove==0 means that object may not be removed. You can still wear it. This only applies to clothing. /N

View File

@@ -70,3 +70,19 @@
del(O) del(O)
crit_fail = 1 crit_fail = 1
icon_state = "brokenpack" icon_state = "brokenpack"
/obj/item/weapon/storage/backpack/santabag
name = "Santa's Gift Bag"
desc = "Space Santa uses this to deliver toys to all the nice children in space in Christmas! Wow, it's pretty big!"
icon_state = "giftbag0"
item_state = "giftbag"
w_class = 4.0
storage_slots = 20
max_w_class = 3
max_combined_w_class = 400 // can store a ton of shit!
New()
..()
return

View File

@@ -162,6 +162,15 @@
src.orient2hud(user) src.orient2hud(user)
W.dropped(user) W.dropped(user)
add_fingerprint(user) add_fingerprint(user)
if(istype(src, /obj/item/weapon/storage/backpack/santabag)) // update the santa bag icon
if(contents.len < 5)
src.icon_state = "giftbag0"
else if(contents.len >= 5 && contents.len < 15)
src.icon_state = "giftbag1"
else if(contents.len >= 15)
src.icon_state = "giftbag2"
if (istype(W, /obj/item/weapon/gun/energy/crossbow)) return //STEALTHY if (istype(W, /obj/item/weapon/gun/energy/crossbow)) return //STEALTHY
for(var/mob/O in viewers(user, null)) for(var/mob/O in viewers(user, null))
O.show_message(text("\blue [user] has added [W] to [src]!")) O.show_message(text("\blue [user] has added [W] to [src]!"))
@@ -185,7 +194,7 @@
return return
/obj/item/weapon/storage/attack_paw(mob/user as mob) /obj/item/weapon/storage/attack_paw(mob/user as mob)
playsound(src.loc, "rustle", 50, 1, -5) //playsound(src.loc, "rustle", 50, 1, -5) // what
return src.attack_hand(user) return src.attack_hand(user)
/obj/item/weapon/storage/attack_hand(mob/user as mob) /obj/item/weapon/storage/attack_hand(mob/user as mob)

View File

@@ -7,6 +7,11 @@ var/savefile/Banlist
var/id = clientvar.computer_id var/id = clientvar.computer_id
var/key = clientvar.ckey var/key = clientvar.ckey
if(!Banlist) // if Banlist cannot be located for some reason
LoadBans() // try to load the bans
if(!Banlist) // uh oh, can't find bans!
return 0 // ABORT ABORT ABORT
Banlist.cd = "/base" Banlist.cd = "/base"
if (Banlist.dir.Find("[key][id]")) if (Banlist.dir.Find("[key][id]"))
Banlist.cd = "[key][id]" Banlist.cd = "[key][id]"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 101 KiB

After

Width:  |  Height:  |  Size: 101 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 100 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 40 KiB

File diff suppressed because it is too large Load Diff