diff --git a/code/game/gamemodes/autotraitor/autotraitor.dm b/code/game/gamemodes/autotraitor/autotraitor.dm index d00acddecf2..51820eaf5f4 100644 --- a/code/game/gamemodes/autotraitor/autotraitor.dm +++ b/code/game/gamemodes/autotraitor/autotraitor.dm @@ -58,6 +58,7 @@ // if(!traitors.len) // return 0 + ..() return 1 diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm index d8f4a7a3850..74a9ac9b217 100644 --- a/code/game/gamemodes/blob/blob.dm +++ b/code/game/gamemodes/blob/blob.dm @@ -51,7 +51,7 @@ var/list/blob_nodes = list() if(!infected_crew.len) return 0 - + ..() return 1 /datum/game_mode/blob/proc/get_blob_candidates() diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index 805db2be393..2793198681c 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -55,6 +55,7 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" changeling.restricted_roles = restricted_jobs modePlayer += changelings changeling.special_role = SPECIAL_ROLE_CHANGELING + ..() return 1 else return 0 diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 6a92052eed5..30066bb6bc9 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -99,6 +99,7 @@ var/global/list/all_cults = list() cult += cultist cultist.restricted_roles = restricted_jobs cultist.special_role = SPECIAL_ROLE_CULTIST + ..() return (cult.len>0) diff --git a/code/game/gamemodes/heist/heist.dm b/code/game/gamemodes/heist/heist.dm index 70207a75598..4819ab20671 100644 --- a/code/game/gamemodes/heist/heist.dm +++ b/code/game/gamemodes/heist/heist.dm @@ -53,6 +53,7 @@ var/global/list/obj/cortical_stacks = list() //Stacks for 'leave nobody behind' for(var/datum/mind/raider in raiders) raider.assigned_role = "MODE" raider.special_role = SPECIAL_ROLE_RAIDER + ..() return 1 /datum/game_mode/heist/pre_setup() diff --git a/code/game/gamemodes/miniantags/abduction/abduction.dm b/code/game/gamemodes/miniantags/abduction/abduction.dm index 32e4b081e94..dd0abda7e31 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction.dm @@ -42,7 +42,7 @@ for(var/i=1,i<=abductor_teams,i++) if(!make_abductor_team(i)) return 0 - + ..() return 1 /datum/game_mode/abduction/proc/make_abductor_team(team_number,preset_agent=null,preset_scientist=null) @@ -134,7 +134,7 @@ equip_scientist(H,team_number) greet_scientist(scientist,team_number) update_abductor_icons_added(scientist) - + return ..() //Used for create antag buttons @@ -341,7 +341,7 @@ else return 0 return 0 - + /datum/game_mode/proc/remove_abductor(datum/mind/abductor_mind) if(abductor_mind in abductors) ticker.mode.abductors -= abductor_mind @@ -351,7 +351,7 @@ to_chat(abductor_mind.current, "You have been turned into a robot! You are no longer an abductor.") else to_chat(abductor_mind.current, "You have been brainwashed! You are no longer an abductor.") - ticker.mode.update_abductor_icons_added(abductor_mind) + ticker.mode.update_abductor_icons_added(abductor_mind) /datum/game_mode/proc/update_abductor_icons_added(datum/mind/alien_mind) var/datum/atom_hud/antag/hud = huds[ANTAG_HUD_ABDUCTOR] diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 5d9a880e12e..e10bab49d78 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -55,6 +55,7 @@ proc/issyndicate(mob/living/M as mob) /datum/game_mode/nuclear/pre_setup() + ..() return 1 /datum/game_mode/proc/remove_operative(datum/mind/operative_mind) @@ -68,8 +69,8 @@ proc/issyndicate(mob/living/M as mob) to_chat(operative_mind.current, "You have been turned into a robot! You are no longer a Syndicate operative.") else to_chat(operative_mind.current, "You have been brainwashed! You are no longer a Syndicate operative.") - ticker.mode.update_synd_icons_removed(operative_mind) - + ticker.mode.update_synd_icons_removed(operative_mind) + //////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////// @@ -161,8 +162,8 @@ proc/issyndicate(mob/living/M as mob) head_organ.b_hair = color2B(hair_c) M.change_eye_color(color2R(eye_c), color2G(eye_c), color2B(eye_c)) M.s_tone = skin_tone - head_organ.h_style = random_hair_style(M.gender, head_organ.species.name) - head_organ.f_style = random_facial_hair_style(M.gender, head_organ.species.name) + head_organ.h_style = random_hair_style(M.gender, head_organ.species.name) + head_organ.f_style = random_facial_hair_style(M.gender, head_organ.species.name) M.body_accessory = null M.regenerate_icons() M.update_body() diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm index c9f29cefc2f..bbb40c92059 100644 --- a/code/game/gamemodes/shadowling/shadowling.dm +++ b/code/game/gamemodes/shadowling/shadowling.dm @@ -97,6 +97,7 @@ Made by Xhuis shadow.special_role = SPECIAL_ROLE_SHADOWLING shadow.restricted_roles = restricted_jobs shadowlings-- + ..() return 1 diff --git a/code/game/gamemodes/vampire/traitor_vamp.dm b/code/game/gamemodes/vampire/traitor_vamp.dm index 068ad772b66..b06db47f02c 100644 --- a/code/game/gamemodes/vampire/traitor_vamp.dm +++ b/code/game/gamemodes/vampire/traitor_vamp.dm @@ -32,7 +32,8 @@ slaved.masters += vampire vampire.som = slaved //we MIGT want to mindslave someone vampire.restricted_roles = restricted_jobs - return ..() + ..() + return 1 else return 0 diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm index 39c9c24ec50..8f4b5afd96f 100644 --- a/code/game/gamemodes/vampire/vampire.dm +++ b/code/game/gamemodes/vampire/vampire.dm @@ -59,6 +59,7 @@ slaved.masters += vampire vampire.som = slaved //we MIGT want to mindslave someone vampire.special_role = SPECIAL_ROLE_VAMPIRE + ..() return 1 else return 0 diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index a38e7dc5541..141a19a6d90 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -38,7 +38,7 @@ /datum/game_mode/wizard/pre_setup() for(var/datum/mind/wiz in wizards) wiz.current.loc = pick(wizardstart) - + ..() return 1 @@ -54,7 +54,7 @@ update_wiz_icons_added(wizard) ..() - + /datum/game_mode/proc/remove_wizard(datum/mind/wizard_mind) if(wizard_mind in wizards) ticker.mode.wizards -= wizard_mind @@ -66,8 +66,8 @@ to_chat(wizard_mind.current, "You have been turned into a robot! You can feel your magical powers fading away...") else to_chat(wizard_mind.current, "You have been brainwashed! You are no longer a wizard.") - ticker.mode.update_wiz_icons_removed(wizard_mind) - + ticker.mode.update_wiz_icons_removed(wizard_mind) + /datum/game_mode/proc/update_wiz_icons_added(datum/mind/wiz_mind) var/datum/atom_hud/antag/wizhud = huds[ANTAG_HUD_WIZ] wizhud.join_hud(wiz_mind.current) diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index 4a5b8bb5718..de5d69c2bbc 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -451,7 +451,7 @@ add_fingerprint(usr) return -/obj/machinery/bodyscanner/narsie_act() +/obj/machinery/atmospherics/unary/cryo_cell/narsie_act() go_out() new /obj/effect/gibspawner/generic(get_turf(loc)) //I REPLACE YOUR TECHNOLOGY WITH FLESH! color = "red"//force the icon to red