cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 18:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dullahan-2-electric-boogaloo

Browse Source
This commit is contained in:
timothyteakettle
2022-08-11 14:43:48 +01:00
parent b260794e54 036d85ec2b
commit 2313a24918
138 changed files with 2006 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/mob/dead/new_player/new_player.dm
View File

@@ -468,12 +468,14 @@
SSjob.AssignRole(src, rank, 1)
var/mob/living/character = create_character(TRUE) //creates the human and transfers vars and mind
var/datum/job/job = SSjob.GetJob(rank)
var/equip = SSjob.EquipRank(character, rank, TRUE)
job.after_latejoin_spawn(character)
if(isliving(equip)) //Borgs get borged in the equip, so we need to make sure we handle the new mob.
character = equip
var/datum/job/job = SSjob.GetJob(rank)
if(job && !job.override_latejoin_spawn(character))
SSjob.SendToLateJoin(character)
if(!arrivals_docked)

8
code/modules/mob/living/carbon/human/species.dm
View File

@@ -832,15 +832,15 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
var/left_state = DEFAULT_LEFT_EYE_STATE
var/right_state = DEFAULT_RIGHT_EYE_STATE
if(eye_type in GLOB.eye_types)
left_state = eye_type + "_left_eye"
right_state = eye_type + "_right_eye"
left_state = "[eye_type]_left_eye"
right_state = "[eye_type]_right_eye"
var/mutable_appearance/left_eye = mutable_appearance('icons/mob/eyes.dmi', left_state, -BODY_LAYER)
var/mutable_appearance/right_eye = mutable_appearance('icons/mob/eyes.dmi', right_state, -BODY_LAYER)
left_eye.category = "HEAD"
right_eye.category = "HEAD"
if((EYECOLOR in species_traits) && has_eyes)
left_eye.color = "#" + H.left_eye_color
right_eye.color = "#" + H.right_eye_color
left_eye.color = "#[H.left_eye_color]"
right_eye.color = "#[H.right_eye_color]"
if(OFFSET_EYES in offset_features)
left_eye.pixel_x += offset_features[OFFSET_EYES][1]
left_eye.pixel_y += offset_features[OFFSET_EYES][2]

2
code/modules/mob/living/simple_animal/friendly/dog.dm
View File

@@ -366,6 +366,8 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
return valid
/mob/living/simple_animal/pet/dog/corgi/proc/update_corgi_fluff()
// First, change back to defaults
name = real_name

2
code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
View File

@@ -436,7 +436,7 @@ Difficulty: Very Hard
H.dropItemToGround(W)
var/datum/job/clown/C = new /datum/job/clown()
C.equip(H)
C.after_spawn(H, H, TRUE)
C.after_spawn(H, H.client, TRUE)
qdel(C)
affected_targets.Add(H)

2
code/modules/mob/living/simple_animal/hostile/netherworld.dm
View File

File diff suppressed because one or more lines are too long

12
code/modules/mob/mob_helpers.dm
View File

@@ -250,7 +250,17 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
animate(pixel_x=rand(min,max), pixel_y=rand(min,max), time=1)
animate(pixel_x=oldx, pixel_y=oldy, time=1)
/proc/directional_recoil(mob/M, strength=1, angle = 0)
if(!M || !M.client)
return
var/client/C = M.client
var/client_screenshake = (C.prefs.recoil_screenshake * 0.01)
strength *= client_screenshake
var/recoil_x = -sin(angle)*4*strength + rand(-strength, strength)
var/recoil_y = -cos(angle)*4*strength + rand(-strength, strength)
animate(C, pixel_x=recoil_x, pixel_y=recoil_y, time=1, easing=SINE_EASING|EASE_OUT, flags=ANIMATION_PARALLEL|ANIMATION_RELATIVE)
animate(pixel_x=0, pixel_y=0, time=3, easing=SINE_EASING|EASE_IN) // according to bhjin this works on more recent byond versions
// if you havent updated uuh sucks to be you then
/proc/findname(msg)
if(!istext(msg))