cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed It won't budge! from crates, added drag and drop for table climbing, added Adajcent check to table climbing.

Browse Source
This commit is contained in:
Zuhayr
2014-06-29 09:40:37 +09:30
parent cf1abf65d9
commit c7e9e1aa2a
2 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
code/game/objects/structures.dm
View File

@@ -24,26 +24,40 @@
/obj/structure/New() /obj/structure/New()
..() ..()
if(climbable) if(climbable)
verbs += /obj/structure/proc/do_climb verbs += /obj/structure/proc/climb_on
/obj/structure/proc/do_climb() /obj/structure/proc/climb_on()
set name = "Climb structure" set name = "Climb structure"
set desc = "Climbs onto a structure." set desc = "Climbs onto a structure."
set category = "Object" set category = "Object"
set src in oview(1) set src in oview(1)
if (!can_touch(usr) || !climbable) do_climb(usr)
/obj/structure/MouseDrop(atom/over_object)
var/mob/living/H = over_object
if(!istype(H)) return ..()
do_climb(H)
/obj/structure/proc/do_climb(var/mob/living/user)
if (!can_touch(user) || !climbable)
return return
usr.visible_message("<span class='warning'>[usr] starts climbing onto \the [src]!</span>") usr.visible_message("<span class='warning'>[user] starts climbing onto \the [src]!</span>")
if(!do_after(usr,50)) if(!do_after(user,50))
return
if (!can_touch(user) || !climbable)
return return
usr.loc = get_turf(src) usr.loc = get_turf(src)
if (get_turf(usr) == get_turf(src)) if (get_turf(user) == get_turf(src))
usr.visible_message("<span class='warning'>[usr] climbs onto \the [src]!</span>") usr.visible_message("<span class='warning'>[user] climbs onto \the [src]!</span>")
/obj/structure/proc/structure_shaken() /obj/structure/proc/structure_shaken()
@@ -93,7 +107,12 @@
/obj/structure/proc/can_touch(var/mob/user) /obj/structure/proc/can_touch(var/mob/user)
if (!user) if (!user)
return 0 return 0
if (user.stat || user.restrained() || user.paralysis || user.sleeping || user.lying || user.weakened) if(!Adjacent(user))
return 0
if (user.restrained() || user.buckled)
user << "<span class='notice'>You need your hands and legs free for this.</span>"
return 0
if (user.stat || user.paralysis || user.sleeping || user.lying || user.weakened)
return 0 return 0
if (issilicon(user)) if (issilicon(user))
user << "<span class='notice'>You need hands for this.</span>" user << "<span class='notice'>You need hands for this.</span>"

3
code/game/objects/structures/crates_lockers/closets.dm
View File

@@ -120,8 +120,9 @@
return 1 return 1
/obj/structure/closet/proc/toggle(mob/user as mob) /obj/structure/closet/proc/toggle(mob/user as mob)
var/orig = src.opened
. = src.opened ? src.close() : src.open() . = src.opened ? src.close() : src.open()
if(!.) if(. == orig)
user << "<span class='notice'>It won't budge!</span>" user << "<span class='notice'>It won't budge!</span>"
return return