cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

more shit

Browse Source
This commit is contained in:
Joe Schmoe
2018-08-29 21:34:48 +02:00
parent 064a4999ee
commit 1b5d3b39df
4 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/__DEFINES/role_preferences.dm
View File

@@ -26,7 +26,7 @@
#define ROLE_SERVANT_OF_RATVAR "servant of Ratvar"
#define ROLE_BROTHER "blood brother"
#define ROLE_BRAINWASHED "brainwashed victim"
#define ROLE_OVERTHROW "syndicate mutineer",
#define ROLE_OVERTHROW "syndicate mutineer"
#define ROLE_SHADOWLING "shadowling" // Yogs
//Missing assignment means it's not a gamemode specific role, IT'S NOT A BUG OR ERROR.
@@ -50,11 +50,8 @@ GLOBAL_LIST_INIT(special_roles, list(
ROLE_ABDUCTOR,
ROLE_DEVIL = /datum/game_mode/devil,
ROLE_SERVANT_OF_RATVAR = /datum/game_mode/clockwork_cult,
<<<<<<< HEAD
ROLE_OVERTHROW = /datum/game_mode/overthrow,
ROLE_SHADOWLING = /datum/game_mode/shadowling //yogs
=======
ROLE_OVERTHROW = /datum/game_mode/overthrow
>>>>>>> 3649e81e78f8cde4a7dc59b442a0b1074ff617c9
))
//Job defines for what happens when you fail to qualify for any job during job selection

2
yogstation/code/datums/components/walks.dm
View File

@@ -63,8 +63,8 @@
if(L.buckled && L.buckled.buckle_prevents_pull)
user.stop_pulling()
return
L.face_atom(user)
pulled = user.pulling
pulled.face_atom(user)
user.pulling.forceMove(get_turf(user))
/datum/component/walk/shadow/finalize_move(mob/living/user, turf/destination)

14
yogstation/code/modules/antagonists/shadowling/shadowling.dm
View File

@@ -74,19 +74,17 @@
/datum/antagonist/shadowling/roundend_report_header()
if(SSticker.mode.shadowling_ascended) //Doesn't end instantly - this is hacky and I don't know of a better way ~X
return "<span class='greentext big'>The shadowlings have ascended and taken over the station!</span>"
return "<span class='greentext big'>The shadowlings have ascended and taken over the station!</span><br>"
else if(!SSticker.mode.shadowling_ascended && check_shadow_death()) //If the shadowlings have ascended, they can not lose the round
return "<span class='redtext big'>The shadowlings have been killed by the crew!</span>"
return "<span class='redtext big'>The shadowlings have been killed by the crew!</span><br>"
else if(!SSticker.mode.shadowling_ascended && SSshuttle.emergency.mode >= SHUTTLE_ESCAPE)
return "<span class='redtext big'>The crew escaped the station before the shadowlings could ascend!</span>"
return "<span class='redtext big'>The crew escaped the station before the shadowlings could ascend!</span><br>"
else
return "<span class='redtext big'>The shadowlings have failed!</span>"
return "<span class='redtext big'>The shadowlings have failed!</span><br>"
/datum/antagonist/shadowling/roundend_report_footer()
var/msg = "<span class='redtext big'>The shadowlings have not managed to convert anyone!</span></div>"
if(LAZYLEN(SSticker.mode.thralls))
msg = "The thralls were:<br>[printplayerlist(SSticker.mode.thralls)]"
return msg
if(!LAZYLEN(SSticker.mode.thralls))
return "<span class='redtext big'>The shadowlings have not managed to convert anyone!</span></div>"
/datum/objective/ascend
explanation_text = "Ascend to your true form by use of the Ascendance ability. This may only be used with 15 or more collective thralls, while hatched, and is unlocked with the Collective Mind ability."

2
yogstation/code/modules/antagonists/shadowling/thrall.dm
View File

@@ -50,4 +50,4 @@ GLOBAL_LIST_INIT(thrall_spell_types, typecacheof(list(/obj/effect/proc_holder/sp
SEND_SOUND(owner.current, sound('yogstation/sound/ambience/antag/thrall.ogg'))
/datum/antagonist/thrall/roundend_report()
return "<div class='panel redborder'>[printplayerlist(SSticker.mode.thralls)]</div>"
return "[printplayerlist(SSticker.mode.thralls)]"