cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 13:38:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Basepixels (#1512)

Browse Source 
* Basepixels (#54652)

* Basepixels

Co-authored-by: Rohesie <rohesie@gmail.com>
This commit is contained in:
SkyratBot
2020-10-30 17:30:11 +00:00
committed by GitHub
co-authored by Rohesie
parent b71c7d3b81
commit 119dd2ea3d
72 changed files with 226 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/riding.dm
+2 -2
View File
@@ -198,8 +198,8 @@
//BUCKLE HOOKS
/datum/component/riding/proc/restore_position(mob/living/buckled_mob)
if(buckled_mob)
buckled_mob.pixel_x = 0
buckled_mob.pixel_y = 0
buckled_mob.pixel_x = buckled_mob.base_pixel_x
buckled_mob.pixel_y = buckled_mob.base_pixel_y
if(buckled_mob.client)
buckled_mob.client.view_size.resetToDefault()
code/datums/martial/wrestling.dm
+25 -25
View File
@@ -243,35 +243,35 @@
if (get_dist(A, D) > 1)
to_chat(A, "<span class='warning'>[D] is too far away!</span>")
A.pixel_x = 0
A.pixel_y = 0
D.pixel_x = 0
D.pixel_y = 0
A.pixel_x = A.base_pixel_x
A.pixel_y = A.base_pixel_y
D.pixel_x = D.base_pixel_x
D.pixel_y = D.base_pixel_y
return
if (!isturf(A.loc) || !isturf(D.loc))
to_chat(A, "<span class='warning'>You can't slam [D] here!</span>")
A.pixel_x = 0
A.pixel_y = 0
D.pixel_x = 0
D.pixel_y = 0
A.pixel_x = A.base_pixel_x
A.pixel_y = A.base_pixel_y
D.pixel_x = D.base_pixel_x
D.pixel_y = D.base_pixel_y
return
else
if (A)
A.pixel_x = 0
A.pixel_y = 0
A.pixel_x = A.base_pixel_x
A.pixel_y = A.base_pixel_y
if (D)
D.pixel_x = 0
D.pixel_y = 0
D.pixel_x = D.base_pixel_x
D.pixel_y = D.base_pixel_y
return
sleep(1)
if (A && D)
A.pixel_x = 0
A.pixel_y = 0
D.pixel_x = 0
D.pixel_y = 0
A.pixel_x = A.base_pixel_x
A.pixel_y = A.base_pixel_y
D.pixel_x = D.base_pixel_x
D.pixel_y = D.base_pixel_y
if (get_dist(A, D) > 1)
to_chat(A, "<span class='warning'>[D] is too far away!</span>")
@@ -310,11 +310,11 @@
else
if (A)
A.pixel_x = 0
A.pixel_y = 0
A.pixel_x = A.base_pixel_x
A.pixel_y = A.base_pixel_y
if (D)
D.pixel_x = 0
D.pixel_y = 0
D.pixel_x = D.base_pixel_x
D.pixel_y = D.base_pixel_y
log_combat(A, D, "body-slammed")
@@ -386,7 +386,7 @@
A.forceMove(ST)
A.visible_message("<span class='danger'>[A] climbs onto [surface]!</span>", \
"<span class='danger'>You climb onto [surface]!</span>")
A.pixel_y = 10
A.pixel_y = A.base_pixel_y + 10
falling = 1
sleep(10)
@@ -394,7 +394,7 @@
// These are necessary because of the sleep call.
if ((falling == 0 && get_dist(A, D) > 1) || (falling == 1 && get_dist(A, D) > 2)) // We climbed onto stuff.
A.pixel_y = 0
A.pixel_y = A.base_pixel_y
if (falling == 1)
A.visible_message("<span class='danger'>...and dives head-first into the ground, ouch!</span>", \
"<span class='userdanger'>...and dive head-first into the ground, ouch!</span>")
@@ -404,7 +404,7 @@
return
if (!isturf(A.loc) || !isturf(D.loc))
A.pixel_y = 0
A.pixel_y = A.base_pixel_y
to_chat(A, "<span class='warning'>You can't drop onto [D] from here!</span>")
return
@@ -432,11 +432,11 @@
D.Paralyze(40)
A.pixel_y = 0
A.pixel_y = A.base_pixel_y
else
if (A)
A.pixel_y = 0
A.pixel_y = A.base_pixel_y
log_combat(A, D, "leg-dropped")
return