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

unf***s job code (oh well)

Browse Source
This commit is contained in:
Putnam3145
2022-08-27 19:16:04 -07:00
parent abc2fcd10e
commit 6bb103e3dc
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/jobs/job_types/ai.dm
View File

@@ -27,7 +27,7 @@
CRASH("dynamic preview is unsupported")
. = H.AIize(latejoin,preference_source)
/datum/job/ai/after_spawn(mob/H, mob/M, latejoin)
/datum/job/ai/after_spawn(mob/H, client/C, latejoin)
. = ..()
if(latejoin)
var/obj/structure/AIcore/latejoin_inactive/lateJoinCore
@@ -41,8 +41,8 @@
H.forceMove(lateJoinCore.loc)
qdel(lateJoinCore)
var/mob/living/silicon/ai/AI = H
AI.apply_pref_name("ai", M.client) //If this runtimes oh well jobcode is fucked.
AI.set_core_display_icon(null, M.client)
AI.apply_pref_name("ai", C) //If this runtimes oh well jobcode is fucked.
AI.set_core_display_icon(null, C)
//we may have been created after our borg
if(SSticker.current_state == GAME_STATE_SETTING_UP)

2
code/modules/jobs/job_types/bartender.dm
View File

@@ -32,7 +32,7 @@
backpack_contents = list(/obj/item/storage/box/beanbag=1,/obj/item/book/granter/action/drink_fling=1)
shoes = /obj/item/clothing/shoes/laceup
/datum/job/bartender/after_spawn(mob/living/H, mob/M, latejoin = FALSE)
/datum/job/bartender/after_spawn(mob/living/H, client/C, latejoin = FALSE)
. = ..()
var/datum/action/innate/drink_fling/D = new
D.Grant(H)

10
code/modules/jobs/job_types/chaplain.dm
View File

@@ -21,7 +21,7 @@
threat = 0.5
/datum/job/chaplain/after_spawn(mob/living/H, mob/M)
/datum/job/chaplain/after_spawn(mob/living/H, client/C)
. = ..()
if(H.mind)
H.mind.isholy = TRUE
@@ -41,12 +41,12 @@
return
var/new_religion = DEFAULT_RELIGION
if(M.client && M.client.prefs.custom_names["religion"])
new_religion = M.client.prefs.custom_names["religion"]
if(C && C.prefs.custom_names["religion"])
new_religion = C.prefs.custom_names["religion"]
var/new_deity = DEFAULT_DEITY
if(M.client && M.client.prefs.custom_names["deity"])
new_deity = M.client.prefs.custom_names["deity"]
if(C && C.prefs.custom_names["deity"])
new_deity = C.prefs.custom_names["deity"]
B.deity_name = new_deity

4
code/modules/jobs/job_types/mime.dm
View File

@@ -21,9 +21,9 @@
threat = 0
/datum/job/mime/after_spawn(mob/living/carbon/human/H, mob/M)
/datum/job/mime/after_spawn(mob/living/carbon/human/H, client/C)
. = ..()
H.apply_pref_name("mime", M.client)
H.apply_pref_name("mime", C)
/datum/outfit/job/mime
name = "Mime"

4
code/modules/jobs/job_types/prisoner.dm
View File

@@ -17,12 +17,12 @@
/datum/job/prisoner/get_latejoin_spawn_point()
return get_roundstart_spawn_point()
/datum/job/prisoner/after_spawn(mob/living/carbon/human/H, mob/M)
/datum/job/prisoner/after_spawn(mob/living/carbon/human/H, client/C)
. = ..()
var/list/policies = CONFIG_GET(keyed_list/policy)
var/policy = policies[POLICYCONFIG_JOB_PRISONER]
if(policy)
var/mob/found = (M?.client && M) || (H?.client && H)
var/mob/found = (H?.client && H)
to_chat(found, "<br><span class='userdanger'>!!READ THIS!!</span><br><span class='warning'>The following is server-specific policy configuration and overrides anything said above if conflicting.</span>")
to_chat(found, "<br><br>")
to_chat(found, "<span class='boldnotice'>[policy]</span>")