cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Shuffling around table and crate knock/climb procs.

Browse Source 
Conflicts:
	code/game/objects/structures.dm
This commit is contained in:
Zuhayr
2014-06-24 06:59:42 -04:00
committed by ZomgPonies
parent a06621b7af
commit 727d7400ee
3 changed files with 94 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/crates.dm
+3 -67
View File
@@ -7,39 +7,10 @@
icon_state = "crate"
icon_opened = "crateopen"
icon_closed = "crate"
climbable = 1
// mouse_drag_pointer = MOUSE_ACTIVE_POINTER //???
var/rigged = 0
//Maybe move both of these procs to a root structure somewhere and have a 'climbable' var on structures.
/obj/structure/closet/crate/proc/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/closet/crate/verb/do_climb()
set name = "Climb crate"
set desc = "Climbs onto a crate."
set category = "Object"
set src in oview(1)
if (!can_touch(usr))
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/closet/crate/can_open()
return 1
@@ -67,44 +38,9 @@
icon_state = icon_opened
src.opened = 1
for(var/mob/living/M in get_turf(src))
if(climbable)
structure_shaken()
if(M.lying) return //No spamming this on people.
M.Weaken(5)
M << "\red You topple as \the [src] moves under you!"
if(prob(100))
var/mob/living/carbon/human/H = M
if(!istype(M))
H << "\red You land heavily!"
M.adjustBruteLoss(rand(15,30))
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(rand(15,30), 0)
else
H << "\red You land heavily!"
H.adjustBruteLoss(rand(15,30))
H.UpdateDamageIcon()
H.updatehealth()
return
/obj/structure/closet/crate/close()
code/game/objects/structures/tables_racks.dm
+4 -65
View File
@@ -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
@@ -415,34 +417,6 @@
return 0
return T.straight_table_check(direction)
/obj/structure/table/proc/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_climb()
set name = "Climb table"
set desc = "Climbs onto a table."
set category = "Object"
set src in oview(1)
if (!can_touch(usr))
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/table/verb/do_flip()
set name = "Flip table"
set desc = "Flips a non-reinforced table"
@@ -458,44 +432,9 @@
usr.visible_message("<span class='warning'>[usr] flips \the [src]!</span>")
for(var/mob/living/M in get_turf(src))
if(climbable)
structure_shaken()
if(M.lying) return //No spamming this on people.
M.Weaken(5)
M << "\red You topple as \the [src] moves under you!"
if(prob(100))
var/mob/living/carbon/human/H = M
if(!istype(M))
H << "\red You land heavily!"
M.adjustBruteLoss(rand(15,30))
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(rand(15,30), 0)
else
H << "\red You land heavily!"
H.adjustBruteLoss(rand(15,30))
H.UpdateDamageIcon()
H.updatehealth()
return
/obj/structure/table/proc/do_put()