cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

relocate edits to _ch files

Browse Source
This commit is contained in:
Raeschen
2021-08-18 08:28:40 +02:00
parent 420e14f093
commit 3bd2e33aa5
5 changed files with 46 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
code/modules/mob/living/simple_mob/simple_mob.dm
View File

@@ -290,47 +290,3 @@
hud_list[STATUS_HUD] = gen_hud_image(buildmode_hud, src, "ai_0", plane = PLANE_BUILDMODE)
hud_list[LIFE_HUD] = gen_hud_image(buildmode_hud, src, "ais_1", plane = PLANE_BUILDMODE)
add_overlay(hud_list)
// CHOMPedit START
// a unique named update_transforms override to allow simplemobs going horizontal on lay/stun.
// This will not make the mob horizontal if the mob has a icon_rest != null
// To use this, add an override in your simplemob subtype of update_transforms with NO . = ..()
// Example:
// /mob/living/simple_mob/my_mob/update_transforms()
// update_transform_horizontal()
/mob/living/simple_mob/proc/update_transform_horizontal()
// First, get the correct size.
var/desired_scale_x = size_multiplier * icon_scale_x
var/desired_scale_y = size_multiplier * icon_scale_y
// Here we differ from mob/living/update_transforms()
// Taking some data from the /carbon/human/update_transform() entry
var/matrix/M = matrix()
var/anim_time = 3
// If we're wanting to lay and there is no icon_rest sprite assigned, then...
if( ( (stat == UNCONSCIOUS) || resting || incapacitated(INCAPACITATION_DISABLED) ) && !icon_rest )
var/randn = rand(1, 2)
if(randn <= 1) // randomly choose a rotation
M.Turn(-90)
else
M.Turn(90)
M.Scale(desired_scale_x, desired_scale_y)
M.Translate(1,-6)
layer = MOB_LAYER -0.01 // Fix for a byond bug where turf entry order no longer matters
else
M.Scale(desired_scale_x, desired_scale_y)
M.Translate(0, (vis_height/2)*(desired_scale_y-1))
layer = MOB_LAYER
// Animate instead of set. Original set left commented out
// src.transform = M //VOREStation edit
animate(src, transform = M, time = anim_time)
// This from original living.dm update_transforms too
handle_status_indicators()
// CHOMPEdit END

41
code/modules/mob/living/simple_mob/simple_mob_ch.dm Normal file
View File

@@ -0,0 +1,41 @@
// a unique named update_transforms override to allow simplemobs going horizontal on lay/stun.
// This will not make the mob horizontal if the mob has a icon_rest != null
// To use this, add an override in your simplemob subtype of update_transforms with NO . = ..()
// Example:
// /mob/living/simple_mob/my_mob/update_transforms()
// update_transform_horizontal()
/mob/living/simple_mob/proc/update_transform_horizontal()
// First, get the correct size.
var/desired_scale_x = size_multiplier * icon_scale_x
var/desired_scale_y = size_multiplier * icon_scale_y
// Here we differ from mob/living/update_transforms()
// Taking some data from the /carbon/human/update_transform() entry
var/matrix/M = matrix()
var/anim_time = 3
// If we're wanting to lay and there is no icon_rest sprite assigned, then...
if( ( (stat == UNCONSCIOUS) || resting || incapacitated(INCAPACITATION_DISABLED) ) && !icon_rest )
var/randn = rand(1, 2)
if(randn <= 1) // randomly choose a rotation
M.Turn(-90)
else
M.Turn(90)
M.Scale(desired_scale_x, desired_scale_y)
M.Translate(1,-6)
layer = MOB_LAYER -0.01 // Fix for a byond bug where turf entry order no longer matters
else
M.Scale(desired_scale_x, desired_scale_y)
M.Translate(0, (vis_height/2)*(desired_scale_y-1))
layer = MOB_LAYER
// Animate instead of set. Original set left commented out
// src.transform = M //VOREStation edit
animate(src, transform = M, time = anim_time)
// This from original living.dm update_transforms too
handle_status_indicators()

8
code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm
View File

@@ -448,11 +448,3 @@
say_maybe_target = list("...mar?")
say_got_target = list("MAR!!!")
//reactions = list("Mar?" = "Marrr!", "Mar!" = "Marrr???", "Mar." = "Marrr.")
// CHOMPEdit START
// Allow horizontal
/mob/living/simple_mob/shadekin/update_transform()
update_transform_horizontal()
// CHOMPEdit END

3
code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin_ch.dm Normal file
View File

@@ -0,0 +1,3 @@
// Allow horizontal
/mob/living/simple_mob/shadekin/update_transform()
update_transform_horizontal()

2
vorestation.dme
View File

@@ -3096,6 +3096,7 @@
#include "code\modules\mob\living\simple_mob\on_click.dm"
#include "code\modules\mob\living\simple_mob\simple_hud.dm"
#include "code\modules\mob\living\simple_mob\simple_mob.dm"
#include "code\modules\mob\living\simple_mob\simple_mob_ch.dm"
#include "code\modules\mob\living\simple_mob\simple_mob_vr.dm"
#include "code\modules\mob\living\simple_mob\taming.dm"
#include "code\modules\mob\living\simple_mob\subtypes\animal\animal.dm"
@@ -3321,6 +3322,7 @@
#include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\rakshasa_abilities.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\rakshasa_trap.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\shadekin.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\shadekin_ch.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\types.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\types_ch.dm"
#include "code\modules\mob\living\voice\voice.dm"