Merge pull request #5342 from Zuhayr/dev

Allows climbing onto tables and crates, also adds falling off if you are...

code/game/objects/structures.dm

@@ -1,11 +1,12 @@
-obj/structure
+/obj/structure
 	icon = 'icons/obj/structures.dmi'
+	var/climbable
 
-obj/structure/blob_act()
+/obj/structure/blob_act()
 	if(prob(50))
 		del(src)
 
-obj/structure/ex_act(severity)
+/obj/structure/ex_act(severity)
 	switch(severity)
 		if(1.0)
 			del(src)
@@ -17,12 +18,84 @@ obj/structure/ex_act(severity)
 		if(3.0)
 			return
 
-obj/structure/meteorhit(obj/O as obj)
+/obj/structure/meteorhit(obj/O as obj)
 	del(src)
 
+/obj/structure/New()
+	..()
+	if(climbable)
+		verbs += /obj/structure/proc/do_climb
 
+/obj/structure/proc/do_climb()
 
+	set name = "Climb structure"
+	set desc = "Climbs onto a structure."
+	set category = "Object"
+	set src in oview(1)
 
+	if (!can_touch(usr) || !climbable)
+		return
 
+	usr.visible_message("<span class='warning'>[usr] starts climbing onto \the [src]!</span>")
 
+	if(!do_after(usr,50))
+		return
 
+	usr.loc = get_turf(src)
+	if (get_turf(usr) == get_turf(src))
+		usr.visible_message("<span class='warning'>[usr] climbs onto \the [src]!</span>")
+
+/obj/structure/proc/structure_shaken()
+
+	for(var/mob/living/M in get_turf(src))
+
+		if(M.lying) return //No spamming this on people.
+
+		M.Weaken(5)
+		M << "\red You topple as \the [src] moves under you!"
+
+		if(prob(25))
+
+			var/damage = rand(15,30)
+			var/mob/living/carbon/human/H = M
+			if(!istype(M))
+				H << "\red You land heavily!"
+				M.adjustBruteLoss(damage)
+				return
+
+			var/datum/organ/external/affecting
+
+			switch(pick(list("ankle","wrist","head","knee","elbow")))
+				if("ankle")
+					affecting = H.get_organ(pick("l_foot", "r_foot"))
+				if("knee")
+					affecting = H.get_organ(pick("l_leg", "r_leg"))
+				if("wrist")
+					affecting = H.get_organ(pick("l_hand", "r_hand"))
+				if("elbow")
+					affecting = H.get_organ(pick("l_arm", "r_arm"))
+				if("head")
+					affecting = H.get_organ("head")
+
+			if(affecting)
+				M << "\red You land heavily on your [affecting.display_name]!"
+				affecting.take_damage(damage, 0)
+				if(affecting.parent)
+					affecting.parent.add_autopsy_data("Misadventure", damage)
+			else
+				H << "\red You land heavily!"
+				H.adjustBruteLoss(damage)
+
+			H.UpdateDamageIcon()
+			H.updatehealth()
+	return
+
+/obj/structure/proc/can_touch(var/mob/user)
+	if (!user)
+		return 0
+	if (user.stat || user.restrained() || user.paralysis || user.sleeping || user.lying || user.weakened)
+		return 0
+	if (issilicon(user))
+		user << "<span class='notice'>You need hands for this.</span>"
+		return 0
+	return 1

code/game/objects/structures/crates_lockers/crates.dm

@@ -7,6 +7,7 @@
 	icon_state = "crate"
 	icon_opened = "crateopen"
 	icon_closed = "crate"
+	climbable = 1
 //	mouse_drag_pointer = MOUSE_ACTIVE_POINTER	//???
 	var/rigged = 0
 
@@ -36,7 +37,11 @@
 		O.loc = get_turf(src)
 	icon_state = icon_opened
 	src.opened = 1
-	return 1
+
+	if(climbable)
+		structure_shaken()
+
+	return
 
 /obj/structure/closet/crate/close()
 	if(!src.opened)

code/game/objects/structures/tables_racks.dm

@@ -19,6 +19,8 @@
 	anchored = 1.0
 	layer = 2.8
 	throwpass = 1	//You can throw objects over this, despite it's density.")
+	climbable = 1
+
 	var/parts = /obj/item/weapon/table_parts
 	var/flipped = 0
 	var/health = 100
@@ -412,31 +414,26 @@
 			return 0
 	return T.straight_table_check(direction)
 
-/obj/structure/table/verb/can_touch(var/mob/user)
-	if (!user)
-		return 0
-	if (user.stat)	//zombie goasts go away
-		return 0
-	if (issilicon(user))
-		user << "<span class='notice'>You need hands for this.</span>"
-		return 0
-	return 1
-
 /obj/structure/table/verb/do_flip()
 	set name = "Flip table"
 	set desc = "Flips a non-reinforced table"
 	set category = "Object"
 	set src in oview(1)
-	if(ismouse(usr))
-		return
-	if (!can_touch(usr))
+
+	if (!can_touch(usr) || ismouse(usr))
 		return
+
 	if(!flip(get_cardinal_dir(usr,src)))
 		usr << "<span class='notice'>It won't budge.</span>"
-	else
-		usr.visible_message("<span class='warning'>[usr] flips \the [src]!</span>")
 		return
 
+	usr.visible_message("<span class='warning'>[usr] flips \the [src]!</span>")
+
+	if(climbable)
+		structure_shaken()
+
+	return
+
 /obj/structure/table/proc/unflipping_check(var/direction)
 	for(var/mob/M in oview(src,0))
 		return 0