From faf0e4fae7d5379c8c16bbe68f35ad729655c5c1 Mon Sep 17 00:00:00 2001
From: QuoteFox <49098813+quotefox@users.noreply.github.com>
Date: Sat, 4 Jul 2020 11:11:31 +0100
Subject: [PATCH] Pixel Shifting for RP

Pixel Shifting for RP
---
 code/modules/keybindings/bindings_mob.dm    |  20 +++++++++---
 code/modules/mob/living/living_movement.dm  |   4 +++
 code/modules/mob/mob_defines.dm             |   1 +
 hyperstation/icons/obj/bluespace_thread.dmi | Bin 329 -> 323 bytes
 hyperstation/icons/obj/condom.dmi           | Bin 182 -> 1108 bytes
 modular_citadel/code/modules/mob/mob.dm     |  32 ++++++++++++++++++++
 6 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/code/modules/keybindings/bindings_mob.dm b/code/modules/keybindings/bindings_mob.dm
index 925f3055..1e97d4d3 100644
--- a/code/modules/keybindings/bindings_mob.dm
+++ b/code/modules/keybindings/bindings_mob.dm
@@ -61,16 +61,28 @@
 	if(client.keys_held["Ctrl"])
 		switch(SSinput.movement_keys[_key])
 			if(NORTH)
-				northface()
+				if(client.keys_held["Shift"])
+					northshift()
+				else
+					northface()
 				return
 			if(SOUTH)
-				southface()
+				if(client.keys_held["Shift"])
+					southshift()
+				else
+					southface()
 				return
 			if(WEST)
-				westface()
+				if(client.keys_held["Shift"])
+					westshift()
+				else
+					westface()
 				return
 			if(EAST)
-				eastface()
+				if(client.keys_held["Shift"])
+					eastshift()
+				else
+					eastface()
 				return
 	return ..()
 
diff --git a/code/modules/mob/living/living_movement.dm b/code/modules/mob/living/living_movement.dm
index 1716d313..b051b59e 100644
--- a/code/modules/mob/living/living_movement.dm
+++ b/code/modules/mob/living/living_movement.dm
@@ -1,6 +1,10 @@
 /mob/living/Moved()
 	. = ..()
 	update_turf_movespeed(loc)
+	if(is_shifted)
+		is_shifted = FALSE
+		pixel_x = get_standard_pixel_x_offset(lying)
+		pixel_y = get_standard_pixel_y_offset(lying)
 
 /mob/living/toggle_move_intent()
 	. = ..()
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 0cb886f1..4f804dd8 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -38,6 +38,7 @@
 	var/lying = 0
 	var/lying_prev = 0
 	var/canmove = 1
+	var/is_shifted = FALSE
 
 	//MOVEMENT SPEED
 	var/list/movespeed_modification				//Lazy list, see mob_movespeed.dm
diff --git a/hyperstation/icons/obj/bluespace_thread.dmi b/hyperstation/icons/obj/bluespace_thread.dmi
index 5edd54e1034dd49fa838c76af1dda1e953f51435..8a2a48353b3e0c7a7f261b834c291cfdd4a513d5 100644
GIT binary patch
delta 134
zcmV;10D1q(0>c83Bmo|gB_ad{gjOh#PKI(_Nkl<ZD3N1e7-E1?*+@wd&SPO<U`;RU
zn1C#h5E>EDfFh6{IulJrSqDM|g9A`S1d<8{2R4S#3}h7vYz*nCok%JY5*Sj$W+16x
oV_*nJQ2_*@5y&dgojx=G02AC6tLLir1ONa407*qoM6N<$f@kn6LI3~&

delta 140
zcmV;70CWGt0?7i9Bmp6jB_ap0v9U@I`(u$yhIL>`L_t(2kz-&OVt`TENJ$aSV_{$j
zO)u-1fGm&@8qv{!B9I<B6G_Dapo%gi6$}nQ6%j}(7#!FbLNkz6B(O20ry{FJNMJ|}
un}MW)je#LNwG&AN5QIh`t3Y@9&;S66n-|+=Hl4Nr0000<MNUMnLSTZ~k1?SD

diff --git a/hyperstation/icons/obj/condom.dmi b/hyperstation/icons/obj/condom.dmi
index cf74d73796c8c6121c0818fdac74e4a7f0ab9a5f..afbec2df0da8da013b64d1a3860b4c873ad8f30c 100644
GIT binary patch
delta 1060
zcmV+<1l#+z0n`Y8iBL{Q4GJ0x0000DNk~Le0001B0000$2m=5B0MhD$JOBUy?NCfq
zMF0Q*f!y;Vr`#v4-8PP%#`gcZ@c%i^_E^;aWzXW0*7JVY@NCcS^Zx(O`v2|!|FHM}
zr0oBY>;HS||8L6XnA-7=*6o1u|9A5LXWso;(f_gA@b>?I{~@T^A*kIXt=>Mq=~>$P
zS;yqf_5E@3|9a;AKEvv6-1=D2|3Aa+BB|Lu!Rvb5_QLT0FuUg|tl)Rw_(0J2F}UP%
z@Bd`j^t|TvM9J=T^8aM&|1QJvx#jgy(eYsB{%h?2Slsg_uHLuf^|a&lVA}aFyXGRZ
z;3l}`g6H`yKh^d>)c8Kr_e<CR{PpVp|Nr*t*o3yvkWq2j00001bW%=J06^y0W&i*H
zmXSd~f1Kiy#FA7XQz<DvIX^EYKR3R-D6ya*HARVwGbOXA7${}P#hF%=n41b=V`v~+
zVSIjR3Gs?E^U`vFV#K=xt|LAtu_!&241F1;xV0%Oxca$(0~P=+QEL>m^-`k%00MJK
zL_t(oh3%GEf0IBI#gP<<IvLxFQJmC;Qe1Jbe;Qoc*cz7szW>MRok=YW+zV;LgAbhi
znm%yn{LdK*9m^UtXi$H;rqniI+oSTcb$NRS<hCJfZ(M#T!1Wt98S3vk&SU}zP9sL+
zTiaSYySF_Y;IliNPkjt9;ST5U1>Y3G_O=z_?!6!g?xO&o3qIoxLkOyYCMX0!7>&Vx
zfA7J=M~}k*Z2<ma#`(VB6af(2B?-0{9qidL=t=k#0Vsdv;0WPjgjETb?l2lh&z{He
zi#UE61~?#5DV+obs1hKq0qAvT@anZH5WgV+ZUUkKmhVG3VC>@rXz=!(@_+w<Y|sv{
zeBn5UAb22<31|?01piN;=O{qm1PF-Ve*!(=id5+^MFG$t3cq~)_Wfu+M*%=kaw&h6
zAWe^t0kI$&MA46v)1Tmv17MSv%cW2GD}c67Q?#UN5JkU!|M7yq#FN}5wTX+xg4o2h
z-bI~+mQCC;bTvTNCJq`jXwaaw#L$Cfe+JXpbh7{*2Gd!xS%5ABI2_BijGX~2e>h#Y
zOfV+1ECU2J<F~I@4)7nBTEDVak~xLY>s#y-IK6Y8B*^;GUL#~tU=G@Vg0oy78MuU>
zMnslnhQE|~lkhJf)=vl28D+-R@7x$-dCeXpurgqSU>K}aC9qu9?VE)2AssLmb$^&Y
zZ*XB!4vAdKnt798W~>pI_OGumZUK@|1t3-#F9I3_%0P7ZS1UAzdI89O0LA|S$jvL4
zxd&?jtim9ef5KM=7*Ati$TC##S1U;pu=f$JqDiQfqyWh4h$b{uy}Ge~Hy^R@(ci)<
e_G&+96P*EMlr3}0arBY^0000<MNUMnLSTZJ{}Vd^

delta 128
zcmcb@v5nEOGr-TCmrII^fq{Y7)59eQNGpIaBQucn-11^OkYWz-32_C|%d2c}0V&3k
zAirP+hi5m^KuRWSGdh^cq_T$Fi*I0K_;{N?*Sq$fHBg4f)5S4_V`g%K#2p}S0R!Vx
SY5#RV7K5j&pUXO@geCw$vmbK+

diff --git a/modular_citadel/code/modules/mob/mob.dm b/modular_citadel/code/modules/mob/mob.dm
index bf6987ab..e2e90ce9 100644
--- a/modular_citadel/code/modules/mob/mob.dm
+++ b/modular_citadel/code/modules/mob/mob.dm
@@ -23,3 +23,35 @@
 		var/turf/sourceturf = get_turf(src)
 		if(istype(speakturf) && istype(sourceturf) && !(speakturf in get_hear(5, sourceturf)))
 			. = "<citspan class='small'>[.]</citspan>" //Don't ask how the fuck this works. It just does.
+
+/mob/verb/eastshift()
+	set hidden = TRUE
+	if(!canface())
+		return FALSE
+	if(pixel_x <= 16)
+		pixel_x++
+		is_shifted = TRUE
+
+/mob/verb/westshift()
+	set hidden = TRUE
+	if(!canface())
+		return FALSE
+	if(pixel_x >= -16)
+		pixel_x--
+		is_shifted = TRUE
+
+/mob/verb/northshift()
+	set hidden = TRUE
+	if(!canface())
+		return FALSE
+	if(pixel_y <= 16)
+		pixel_y++
+		is_shifted = TRUE
+
+/mob/verb/southshift()
+	set hidden = TRUE
+	if(!canface())
+		return FALSE
+	if(pixel_y >= -16)
+		pixel_y--
+		is_shifted = TRUE
\ No newline at end of file