cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-16 02:24:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '179a607a90ad7ec62bdaff4e6fe72af60ee56442' of https://github.com/tgstation/tgstation into upstream-24-10b

Browse Source
This commit is contained in:
Majkl-J
2024-10-23 23:27:16 -07:00
parent c90e3e69b9 179a607a90
commit e59d8ba64b
4642 changed files with 25352 additions and 14167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob_spawn/ghost_roles/mining_roles.dm
+3 -3
View File
@@ -186,12 +186,12 @@
switch(damage_type)
if(BRUTE)
if(damage_amount)
playsound(loc, 'sound/effects/attackblob.ogg', 100, TRUE)
playsound(loc, 'sound/effects/blob/attackblob.ogg', 100, TRUE)
else
playsound(src, 'sound/weapons/tap.ogg', 50, TRUE)
playsound(src, 'sound/items/weapons/tap.ogg', 50, TRUE)
if(BURN)
if(damage_amount)
playsound(loc, 'sound/items/welder.ogg', 100, TRUE)
playsound(loc, 'sound/items/tools/welder.ogg', 100, TRUE)
/obj/structure/ash_walker_eggshell/attack_ghost(mob/user) //Pass on ghost clicks to the mob spawner
if(egg)
code/modules/mob_spawn/ghost_roles/unused_roles.dm
+2 -2
View File
@@ -167,7 +167,7 @@
message = "<b>You wished for power. Little good it did you, cast out of the light. You are the [gender == MALE ? "king" : "queen"] of a hell that holds no subjects. You feel only remorse.</b>"
if(4)
message = "<b>You wished for immortality, even as your friends lay dying behind you. No matter how many times you cast yourself into the lava, you awaken in this room again within a few days. There is no escape.</b>"
to_chat(new_spawn, "<span class='infoplain'>[message]</span>")
to_chat(new_spawn, span_infoplain("[message]"))
/obj/effect/mob_spawn/ghost_role/human/nanotrasensoldier
name = "sleeper"
@@ -273,7 +273,7 @@
/obj/effect/mob_spawn/ghost_role/human/syndicatespace/special(mob/living/new_spawn)
. = ..()
new_spawn.grant_language(/datum/language/codespeak, source = LANGUAGE_SPAWNER) // SKYRAT EDIT CHANGE - ORIGINAL: new_spawn.grant_language(/datum/language/codespeak, source = LANGUAGE_MIND)
var/datum/job/spawn_job = SSjob.GetJobType(spawner_job_path)
var/datum/job/spawn_job = SSjob.get_job_type(spawner_job_path)
var/policy = get_policy(spawn_job.policy_index)
if(policy)
to_chat(new_spawn, span_bold("[policy]"))
code/modules/mob_spawn/mob_spawn.dm
+2 -2
View File
@@ -259,11 +259,11 @@
spawned_mob.key = mob_possessor.key
var/datum/mind/spawned_mind = spawned_mob.mind
if(spawned_mind)
spawned_mob.mind.set_assigned_role_with_greeting(SSjob.GetJobType(spawner_job_path))
spawned_mob.mind.set_assigned_role_with_greeting(SSjob.get_job_type(spawner_job_path))
spawned_mind.name = spawned_mob.real_name
if(show_flavor)
var/output_message = "<span class='infoplain'><span class='big bold'>[you_are_text]</span></span>"
var/output_message = span_infoplain("<span class='big bold'>[you_are_text]</span>")
if(flavour_text != "")
output_message += "\n<span class='infoplain'><b>[flavour_text]</b></span>"
if(important_text != "")