Final Nations patch before live testing. This is going to be painful.

This commit is contained in:
ZomgPonies
2014-05-27 20:09:10 -04:00
parent 386618f66b
commit 06bbfcf150
16 changed files with 190 additions and 50 deletions
+5 -5
View File
@@ -134,14 +134,14 @@
return
/obj/item/attack_hand(mob/user as mob)
if (!user) return
if (!user) return 0
if (hasorgans(user))
var/datum/organ/external/temp = user:organs_by_name["r_hand"]
if (user.hand)
temp = user:organs_by_name["l_hand"]
if(temp && !temp.is_usable())
user << "<span class='notice'>You try to move your [temp.display_name], but cannot!"
return
return 0
if (istype(src.loc, /obj/item/weapon/storage))
//If the item is in a storage item, take it out
@@ -152,17 +152,17 @@
if (src.loc == user)
//canremove==0 means that object may not be removed. You can still wear it. This only applies to clothing. /N
if(!src.canremove)
return
return 0
else
user.u_equip(src)
else
if(isliving(src.loc))
return
return 0
user.next_move = max(user.next_move+2,world.time + 2)
src.pickup(user)
add_fingerprint(user)
user.put_in_active_hand(src)
return
return 1
/obj/item/attack_paw(mob/user as mob)
@@ -36,7 +36,7 @@
max_w_class = 2
storage_slots = 21
can_hold = list() // any
cant_hold = list("/obj/item/weapon/disk/nuclear")
cant_hold = list("/obj/item/weapon/disk/nuclear","/obj/item/flag/nation")
/obj/item/weapon/storage/bag/trash/update_icon()
if(contents.len == 0)
@@ -63,7 +63,7 @@
max_w_class = 2
storage_slots = 21
can_hold = list() // any
cant_hold = list("/obj/item/weapon/disk/nuclear")
cant_hold = list("/obj/item/weapon/disk/nuclear","/obj/item/flag/nation")
// -----------------------------
// Mining Satchel
+3 -1
View File
@@ -322,7 +322,9 @@
if(!isemptylist(src.search_contents_for(/obj/item/weapon/disk/nuclear)))
usr << "You get the feeling that you shouldn't cremate one of the items in the cremator."
return
if(!isemptylist(src.search_contents_for(/obj/item/flag/nation)))
usr << "You get the feeling that you shouldn't cremate one of the items in the cremator."
return
for (var/mob/M in viewers(src))
M.show_message("\red You hear a roar as the crematorium activates.", 1)