shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing riding layers for human/cyborgs.

Browse Source
This commit is contained in:
Ghommie
2020-04-25 16:54:17 +02:00
parent debbd3edab
commit d2d5fda0e2
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/layers_planes.dm
+2
View File
@@ -61,7 +61,9 @@
#define BELOW_MOB_LAYER 3.7 #define BELOW_MOB_LAYER 3.7
#define LYING_MOB_LAYER 3.8 #define LYING_MOB_LAYER 3.8
#define MOB_LOWER_LAYER 3.95
//#define MOB_LAYER 4 //For easy recordkeeping; this is a byond define //#define MOB_LAYER 4 //For easy recordkeeping; this is a byond define
#define MOB_UPPER_LAYER 4.05
#define ABOVE_MOB_LAYER 4.1 #define ABOVE_MOB_LAYER 4.1
#define WALL_OBJ_LAYER 4.25 #define WALL_OBJ_LAYER 4.25
#define EDGED_TURF_LAYER 4.3 #define EDGED_TURF_LAYER 4.3
code/datums/components/riding.dm
+5
View File
@@ -198,6 +198,7 @@
/datum/component/riding/human/Initialize() /datum/component/riding/human/Initialize()
. = ..() . = ..()
directional_vehicle_layers = list(TEXT_NORTH = MOB_LOWER_LAYER, TEXT_SOUTH = MOB_UPPER_LAYER, TEXT_EAST = MOB_UPPER_LAYER, TEXT_WEST = MOB_UPPER_LAYER)
RegisterSignal(parent, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, .proc/on_host_unarmed_melee) RegisterSignal(parent, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, .proc/on_host_unarmed_melee)
/datum/component/riding/human/vehicle_mob_unbuckle(datum/source, mob/living/M, force = FALSE) /datum/component/riding/human/vehicle_mob_unbuckle(datum/source, mob/living/M, force = FALSE)
@@ -261,6 +262,10 @@
/datum/component/riding/cyborg /datum/component/riding/cyborg
/datum/component/riding/cyborg/Initialize()
. = ..()
directional_vehicle_layers = list(TEXT_NORTH = MOB_LOWER_LAYER, TEXT_SOUTH = MOB_UPPER_LAYER, TEXT_EAST = MOB_UPPER_LAYER, TEXT_WEST = MOB_UPPER_LAYER)
/datum/component/riding/cyborg/ride_check(mob/user) /datum/component/riding/cyborg/ride_check(mob/user)
var/atom/movable/AM = parent var/atom/movable/AM = parent
if(user.incapacitated()) if(user.incapacitated())