diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 1aed6d69349..56b207a8c3f 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -62,11 +62,11 @@ datum/mind text = uppertext(text) text = "[text]: " if (src.assigned_role in head_positions) - text += "HEAD|officer|employer|headrev|rev" + text += "HEAD|officer|employee|headrev|rev" else if (src.assigned_role in list("Security Officer", "Detective", "Warden")) - text += "head|OFFICER|employer|headre|rev" + text += "head|OFFICER|employee|headre|rev" else if (src in ticker.mode.head_revolutionaries) - text = "head|officer|employer|HEADREV|rev" + text = "head|officer|employee|HEADREV|rev" text += "
Flash: give" var/list/L = src.current.get_contents() @@ -83,7 +83,7 @@ datum/mind if (objectives.len==0) text += "
Objectives are empty! Set to kill all heads." else if (src in ticker.mode.revolutionaries) - text += "head|officer|employer|headrev|REV" + text += "head|officer|employee|headrev|REV" else text += "head|officer|EMPLOYER|headrev|rev" sections["revolution"] = text @@ -94,11 +94,11 @@ datum/mind text = uppertext(text) text = "[text]: " if (src.assigned_role in head_positions) - text += "HEAD|officer|employer|cultist" + text += "HEAD|officer|employee|cultist" else if (src.assigned_role in list("Security Officer", "Detective", "Warden")) - text += "head|OFFICER|employer|cultist" + text += "head|OFFICER|employee|cultist" else if (src in ticker.mode.cult) - text += "head|officer|employer|CULTIST" + text += "head|officer|employee|CULTIST" text += "
Give tome|amulet." /* if (objectives.len==0) diff --git a/code/game/gamemodes/extended/extended.dm b/code/game/gamemodes/extended/extended.dm index 4d370b00c03..5cef9adb0fa 100644 --- a/code/game/gamemodes/extended/extended.dm +++ b/code/game/gamemodes/extended/extended.dm @@ -11,3 +11,5 @@ spawn_exporation_packs() return 1 +/datum/game_mode/extended/can_start() + return (num_players() > 0) \ No newline at end of file diff --git a/code/game/gamemodes/sandbox/sandbox.dm b/code/game/gamemodes/sandbox/sandbox.dm index 01fcfa0593d..54801511be4 100644 --- a/code/game/gamemodes/sandbox/sandbox.dm +++ b/code/game/gamemodes/sandbox/sandbox.dm @@ -16,4 +16,7 @@ return 1 /datum/game_mode/sandbox/check_finished() - return 0 \ No newline at end of file + return 0 + +/datum/game_mode/extended/can_start() + return 1 \ No newline at end of file diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index 4504863d9bf..8dace219f57 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -228,7 +228,7 @@ /datum/game_mode/wizard/declare_completion() if(finished) - world << "\red The wizard[(wizards.len>1)?"s":""] has been killed by the crew! The Space Wizards Fediration has been taught a lesson they will not soon forget!" + world << "\red The wizard[(wizards.len>1)?"s":""] has been killed by the crew! The Space Wizards Federation has been taught a lesson they will not soon forget!" ..() return 1 diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index ad685ce4813..85f37b3bdc3 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -1,7 +1,11 @@ var/global/list/uneatable = list( /obj/machinery/singularity, - /turf/space,/obj/effects, - /obj/overlay) + /turf/space, + /obj/effects, + /obj/overlay, + /obj/decal/cleanable, + /obj/rune, + ) /obj/machinery/singularity/ name = "Gravitational Singularity"