Fix fix fix

This commit is contained in:
ZomgPonies
2013-11-25 14:02:28 -05:00
parent 533ac36a7b
commit 33880575fe
6 changed files with 11641 additions and 11598 deletions
+1
View File
@@ -59,6 +59,7 @@
/obj/item/weapon/beach_ball/dodgeball
name = "dodgeball"
icon = 'icons/obj/basketball.dmi'
icon_state = "dodgeball"
item_state = "dodgeball"
desc = "Used for playing the most violent and degrading of childhood games."
+7 -7
View File
@@ -334,24 +334,24 @@
//Throwing stuff
/mob/living/carbon/proc/toggle_throw_mode()
if (src.in_throw_mode)
if (in_throw_mode)
throw_mode_off()
else
throw_mode_on()
/mob/living/carbon/proc/throw_mode_off()
src.in_throw_mode = 0
src.throw_icon.icon_state = "act_throw_off"
in_throw_mode = 0
throw_icon.icon_state = "act_throw_off"
/mob/living/carbon/proc/throw_mode_on()
src.in_throw_mode = 1
src.throw_icon.icon_state = "act_throw_on"
in_throw_mode = 1
throw_icon.icon_state = "act_throw_on"
/mob/proc/throw_item(atom/target)
return
/mob/living/carbon/throw_item(atom/target)
src.throw_mode_off()
throw_mode_off()
if(usr.stat || !target)
return
if(target.type == /obj/screen) return
@@ -382,7 +382,7 @@
update_icons()
if (istype(usr, /mob/living/carbon)) //Check if a carbon mob is throwing. Modify/remove this line as required.
item.loc = src.loc
item.loc = usr.loc
if(src.client)
src.client.screen -= item
if(istype(item, /obj/item))
@@ -1,10 +1,15 @@
/mob/living/carbon/hitby(atom/movable/AM, skip)
if(!skip) //ugly, but easy
message_admins("Skip Check Passed")
if(in_throw_mode && !get_active_hand()) //empty active hand and we're in throw mode
message_admins("In Throw Mode and active hand check passed")
if(canmove && !restrained())
message_admins("Restrained/moving check passed")
if(istype(AM, /obj/item))
message_admins("Item check passed")
var/obj/item/I = AM
if(isturf(I.loc))
message_admins("Turf check passed")
put_in_active_hand(I)
visible_message("<span class='warning'>[src] catches [I]!</span>")
throw_mode_off()