cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-23 05:07:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9265 from Detective-Google/pixel-shift

Browse Source 
Ports Pixel shifting.
This commit is contained in:
Verkister
2020-10-31 19:37:42 +00:00
committed by Chompstation Bot
parent 2fda5bc91f
commit 2e68ca894d
4 changed files with 89 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living.dm
+6
View File
@@ -924,6 +924,12 @@ default behaviour is:
/mob/living/Moved(var/atom/oldloc, direct, forced, movetime)
. = ..()
handle_footstep(loc)
// Begin VOREstation edit
if(is_shifted)
is_shifted = FALSE
pixel_x = 0
pixel_y = 0
// End VOREstation edit
if(pulling) // we were pulling a thing and didn't lose it during our move.
var/pull_dir = get_dir(src, pulling)
code/modules/mob/mob.dm
+34
View File
@@ -1022,6 +1022,40 @@ mob/proc/yank_out_object()
set hidden = 1
set_face_dir(client.client_dir(WEST))
// Begin VOREstation edit
/mob/verb/shiftnorth()
set hidden = TRUE
if(!canface())
return FALSE
if(pixel_y <= 16)
pixel_y++
is_shifted = TRUE
/mob/verb/shiftsouth()
set hidden = TRUE
if(!canface())
return FALSE
if(pixel_y >= -16)
pixel_y--
is_shifted = TRUE
/mob/verb/shiftwest()
set hidden = TRUE
if(!canface())
return FALSE
if(pixel_x >= -16)
pixel_x--
is_shifted = TRUE
mob/verb/shifteast()
set hidden = TRUE
if(!canface())
return FALSE
if(pixel_x <= 16)
pixel_x++
is_shifted = TRUE
// End VOREstation edit
/mob/proc/adjustEarDamage()
return
code/modules/mob/mob_defines.dm
+1
View File
@@ -83,6 +83,7 @@
var/resting = 0 //Carbon
var/lying = 0
var/lying_prev = 0
var/is_shifted = FALSE // VoreStation Edit; pixel shifting
var/canmove = 1
//Allows mobs to move through dense areas without restriction. For instance, in space or out of holder objects.
var/incorporeal_move = 0 //0 is off, 1 is normal, 2 is for ninjas.
interface/skin.dmf
+48
View File
@@ -53,6 +53,18 @@ macro "borghotkeymode"
elem
name = "SOUTH+REP"
command = ".movedown"
elem
name = "CTRL+SHIFT+NORTH"
command = "shiftnorth"
elem
name = "CTRL+SHIFT+SOUTH"
command = "shiftsouth"
elem
name = "CTRL+SHIFT+WEST"
command = "shiftwest"
elem
name = "CTRL+SHIFT+EAST"
command = "shifteast"
elem
name = "INSERT"
command = "a-intent right"
@@ -274,6 +286,18 @@ macro "macro"
elem
name = "SOUTH+REP"
command = ".movedown"
elem
name = "CTRL+SHIFT+NORTH"
command = "shiftnorth"
elem
name = "CTRL+SHIFT+SOUTH"
command = "shiftsouth"
elem
name = "CTRL+SHIFT+WEST"
command = "shiftwest"
elem
name = "CTRL+SHIFT+EAST"
command = "shifteast"
elem
name = "INSERT"
command = "a-intent right"
@@ -441,6 +465,18 @@ macro "hotkeymode"
elem
name = "SOUTH+REP"
command = ".movedown"
elem
name = "CTRL+SHIFT+NORTH"
command = "shiftnorth"
elem
name = "CTRL+SHIFT+SOUTH"
command = "shiftsouth"
elem
name = "CTRL+SHIFT+WEST"
command = "shiftwest"
elem
name = "CTRL+SHIFT+EAST"
command = "shifteast"
elem
name = "INSERT"
command = "a-intent right"
@@ -680,6 +716,18 @@ macro "borgmacro"
elem
name = "SOUTH+REP"
command = ".movedown"
elem
name = "CTRL+SHIFT+NORTH"
command = "shiftnorth"
elem
name = "CTRL+SHIFT+SOUTH"
command = "shiftsouth"
elem
name = "CTRL+SHIFT+WEST"
command = "shiftwest"
elem
name = "CTRL+SHIFT+EAST"
command = "shifteast"
elem
name = "INSERT"
command = "a-intent right"