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

Merge pull request #2252 from tigercat2000/atommovablebuckling

Browse Source 
Move buckling to /atom/movable, can now buckle to mobs if adminbooze
This commit is contained in:
Fox McCloud
2015-10-01 19:01:39 -04:00
parent fc5641d926 575362b0f4
commit 62d25caec7
10 changed files with 79 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/buckling.dm
+13 -17
View File
@@ -1,32 +1,32 @@
/obj
/atom/movable
var/can_buckle = 0
var/buckle_lying = -1 //bed-like behaviour, forces mob.lying = buckle_lying if != -1
var/buckle_lying = -1 //bed-like behaviour, forces mob.lying = buckle_lying if != -1 //except -1 actually means "rotate 90 degrees to the left" as it is used by 1*buckle_lying.
var/buckle_requires_restraints = 0 //require people to be handcuffed before being able to buckle. eg: pipes
var/mob/living/buckled_mob = null
//Interaction
/obj/attack_hand(mob/living/user)
/atom/movable/attack_hand(mob/living/user)
. = ..()
if(can_buckle && buckled_mob)
return user_unbuckle_mob(user)
/obj/MouseDrop_T(mob/living/M, mob/living/user)
/atom/movable/MouseDrop_T(mob/living/M, mob/living/user)
. = ..()
if(can_buckle && istype(M))
return user_buckle_mob(M, user)
//Cleanup
/obj/Destroy()
/atom/movable/Destroy()
. = ..()
unbuckle_mob()
//procs that handle the actual buckling and unbuckling
/obj/proc/buckle_mob(mob/living/M)
if(!can_buckle || !istype(M) || (M.loc != loc) || M.buckled || (buckle_requires_restraints && !M.restrained()))
/atom/movable/proc/buckle_mob(mob/living/M)
if(!can_buckle || !istype(M) || (M.loc != loc) || M.buckled || M.buckled_mob || (buckle_requires_restraints && !M.restrained()) || M == src)
return 0
if (isslime(M) || isAI(M))
@@ -43,8 +43,8 @@
post_buckle_mob(M)
return 1
/obj/proc/unbuckle_mob()
if(buckled_mob && buckled_mob.buckled == src)
/atom/movable/proc/unbuckle_mob()
if(buckled_mob && buckled_mob.buckled == src && buckled_mob.can_unbuckle(usr))
. = buckled_mob
buckled_mob.buckled = null
buckled_mob.anchored = initial(buckled_mob.anchored)
@@ -56,17 +56,16 @@
//Handle any extras after buckling/unbuckling
//Called on buckle_mob() and unbuckle_mob()
/obj/proc/post_buckle_mob(mob/living/M)
/atom/movable/proc/post_buckle_mob(mob/living/M)
return
//Wrapper procs that handle sanity and user feedback
/obj/proc/user_buckle_mob(mob/living/M, mob/user)
/atom/movable/proc/user_buckle_mob(mob/living/M, mob/user)
if(!in_range(user, src) || user.stat || user.restrained())
return 0
return
add_fingerprint(user)
unbuckle_mob()
if(buckle_mob(M))
if(M == user)
@@ -79,9 +78,8 @@
"<span class='warning'>[user] buckles [M] to [src]!</span>",\
"<span class='warning'>[user] buckles you to [src]!</span>",\
"<span class='italics'>You hear metal clanking.</span>")
return 1
/obj/proc/user_unbuckle_mob(mob/user)
/atom/movable/proc/user_unbuckle_mob(mob/user)
var/mob/living/M = unbuckle_mob()
if(M)
if(M != user)
@@ -96,5 +94,3 @@
"<span class='italics'>You hear metal clanking.</span>")
add_fingerprint(user)
return M
code/game/objects/structures/stool_bed_chair_nest/bed.dm
-20
View File
@@ -30,26 +30,6 @@
desc = "This looks similar to contraptions from earth. Could aliens be stealing our technology?"
icon_state = "abed"
/obj/structure/stool/bed/Move(atom/newloc, direct) //Some bed children move
. = ..()
if(buckled_mob)
if(!buckled_mob.Move(loc, direct))
loc = buckled_mob.loc //we gotta go back
last_move = buckled_mob.last_move
inertia_dir = last_move
buckled_mob.inertia_dir = last_move
. = 0
/obj/structure/stool/bed/Process_Spacemove(movement_dir = 0)
if(buckled_mob)
return buckled_mob.Process_Spacemove(movement_dir)
return ..()
/obj/structure/stool/bed/CanPass(atom/movable/mover, turf/target, height=1.5)
if(mover == buckled_mob)
return 1
return ..()
/obj/structure/stool/bed/proc/handle_rotation()
return