< href='byond://?src=\ref[src];show_preferences=1'>Setup Character
"
if(!SSticker || SSticker.current_state <= GAME_STATE_PREGAME)
- if(ready)
- output += "\[ Ready | Not Ready \]
"
- else
- output += "\[ Ready | Not Ready \]
"
+ switch(ready)
+ if(PLAYER_NOT_READY)
+ output += "\[ [linkify_ready("Ready", PLAYER_READY_TO_PLAY)] | Not Ready | [linkify_ready("Observe", PLAYER_READY_TO_OBSERVE)] \]
"
+ if(PLAYER_READY_TO_PLAY)
+ output += "\[ Ready | [linkify_ready("Not Ready", PLAYER_NOT_READY)] | [linkify_ready("Observe", PLAYER_READY_TO_OBSERVE)] \]
"
+ if(PLAYER_READY_TO_OBSERVE)
+ output += "\[ [linkify_ready("Ready", PLAYER_READY_TO_PLAY)]] | [linkify_ready("Not Ready", PLAYER_NOT_READY)] | Observe \]
"
else
output += "View the Crew Manifest
"
output += "Join Game!
"
-
- output += "Observe
"
+ output += "[linkify_ready("Observe", 2)]
"
if(!IsGuestKey(src.key))
if (SSdbcore.Connect())
@@ -108,42 +112,23 @@
return 1
if(href_list["ready"])
- if(!SSticker || SSticker.current_state <= GAME_STATE_PREGAME) // Make sure we don't ready up after the round has started
- ready = text2num(href_list["ready"])
+ if(SSticker)
+ var/tready = text2num(href_list["ready"])
+ //Avoid updating ready if we're after PREGAME (they should use latejoin instead)
+ //This is likely not an actual issue but I don't have time to prove that this
+ //no longer is required
+ if(SSticker.current_state <= GAME_STATE_PREGAME)
+ ready = tready
+ //if it's post initialisation and they're trying to observe we do the needful
+ if(!SSticker.current_state < GAME_STATE_PREGAME && tready == PLAYER_READY_TO_OBSERVE)
+ ready = tready
+ make_me_an_observer()
+ return
if(href_list["refresh"])
src << browse(null, "window=playersetup") //closes the player setup window
new_player_panel()
- if(href_list["observe"])
-
- if(alert(src,"Are you sure you wish to observe? You will not be able to play this round!","Player Setup","Yes","No") == "Yes")
- if(!client)
- return 1
- var/mob/dead/observer/observer = new()
-
- spawning = 1
-
- observer.started_as_observer = 1
- close_spawn_windows()
- var/obj/O = locate("landmark*Observer-Start")
- to_chat(src, "Now teleporting.")
- if (O)
- observer.loc = O.loc
- else
- to_chat(src, "Teleporting failed. The map is probably still loading...")
- observer.key = key
- observer.client = client
- observer.set_ghost_appearance()
- if(observer.client && observer.client.prefs)
- observer.real_name = observer.client.prefs.real_name
- observer.name = observer.real_name
- observer.update_icon()
- observer.stop_sound_channel(CHANNEL_LOBBYMUSIC)
- QDEL_NULL(mind)
- qdel(src)
- return 1
-
if(href_list["late_join"])
if(!SSticker || !SSticker.IsRoundInProgress())
to_chat(usr, "The round is either not ready, or has already finished...")
@@ -273,6 +258,42 @@
return
to_chat(src, "Vote successful.")
+//When you cop out of the round (NB: this HAS A SLEEP FOR PLAYER INPUT IN IT)
+/mob/dead/new_player/proc/make_me_an_observer()
+ if(QDELETED(src) || !src.client)
+ ready = PLAYER_NOT_READY
+ return FALSE
+
+ var/this_is_like_playing_right = alert(src,"Are you sure you wish to observe? You will not be able to play this round!","Player Setup","Yes","No")
+
+ if(QDELETED(src) || !src.client || this_is_like_playing_right != "Yes")
+ ready = PLAYER_NOT_READY
+ return FALSE
+
+ var/mob/dead/observer/observer = new()
+ spawning = TRUE
+
+ observer.started_as_observer = TRUE
+ close_spawn_windows()
+ var/obj/O = locate("landmark*Observer-Start")
+ to_chat(src, "Now teleporting.")
+ if (O)
+ observer.loc = O.loc
+ else
+ to_chat(src, "Teleporting failed. Ahelp an admin please")
+ stack_trace("There's no freaking observer landmark available on this map or you're making observers before the map is initialised")
+ observer.key = key
+ observer.client = client
+ observer.set_ghost_appearance()
+ if(observer.client && observer.client.prefs)
+ observer.real_name = observer.client.prefs.real_name
+ observer.name = observer.real_name
+ observer.update_icon()
+ observer.stop_sound_channel(CHANNEL_LOBBYMUSIC)
+ QDEL_NULL(mind)
+ qdel(src)
+ return TRUE
+
/mob/dead/new_player/proc/IsJobAvailable(rank)
var/datum/job/job = SSjob.GetJob(rank)
if(!job)
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 694c9592c4f..6e453f68ef9 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -119,7 +119,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
GLOB.dead_mob_list += src
- ..()
+ . = ..()
grant_all_languages()
diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm
index 90d4ced85fc..71619ff9a41 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm
@@ -45,9 +45,6 @@
if(!get_alien_type(/mob/living/carbon/alien/humanoid/royal/queen))
var/mob/living/carbon/alien/humanoid/royal/queen/new_xeno = new (user.loc)
user.alien_evolve(new_xeno)
- if(new_xeno.client.prefs.unlock_content)
- var/datum/action/innate/maid/M = new()
- M.Grant(new_xeno)
return 1
else
to_chat(user, "We already have an alive queen.")
diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm
index dc172b7730d..392e7ec67a9 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm
@@ -153,36 +153,3 @@
/obj/item/queenpromote/attack_self(mob/user)
to_chat(user, "You discard [src].")
qdel(src)
-
-//:^)
-/datum/action/innate/maid
- name = "Maidify"
- button_icon_state = "alien_queen_maidify"
- check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUNNED|AB_CHECK_CONSCIOUS|AB_CHECK_LYING
- background_icon_state = "bg_alien"
-
-/datum/action/innate/maid/Activate()
- var/mob/living/carbon/alien/humanoid/royal/queen/A = owner
- A.maidify()
- active = TRUE
-
-/datum/action/innate/maid/Deactivate()
- var/mob/living/carbon/alien/humanoid/royal/queen/A = owner
- A.unmaidify()
- active = FALSE
-
-
-
-/mob/living/carbon/alien/humanoid/royal/queen/proc/maidify()
- name = "alien queen maid"
- desc = "Lusty, Sexy"
- icon_state = "alienqmaid"
- caste = "qmaid"
- update_icons()
-
-/mob/living/carbon/alien/humanoid/royal/queen/proc/unmaidify()
- name = "alien queen"
- desc = ""
- icon_state = "alienq"
- caste = "q"
- update_icons()
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 82e53a73000..a5da6abdb8c 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -232,9 +232,6 @@
if(lying)
M.visible_message("[M] shakes [src] trying to get [p_them()] up!", \
"You shake [src] trying to get [p_them()] up!")
- else if(check_zone(M.zone_selected) == "head")
- M.visible_message("[M] gives [src] a pat on the head to make [p_them()] feel better!", \
- "You give [src] a pat on the head to make [p_them()] feel better!")
else
M.visible_message("[M] hugs [src] to make [p_them()] feel better!", \
"You hug [src] to make [p_them()] feel better!")
@@ -303,8 +300,9 @@
Weaken(stun_pwr*effect_amount)
if(istype(ears) && (deafen_pwr || damage_pwr))
- ears.ear_damage += damage_pwr * effect_amount
- ears.deaf = max(ears.deaf, deafen_pwr * effect_amount)
+ var/ear_damage = damage_pwr * effect_amount
+ var/deaf = max(ears.deaf, deafen_pwr * effect_amount)
+ adjustEarDamage(ear_damage,deaf)
if(ears.ear_damage >= 15)
to_chat(src, "Your ears start to ring badly!")
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 9ca002fe102..214ba337514 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -1082,18 +1082,7 @@
/datum/species/proc/disarm(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style)
- var/aim_for_mouth = user.zone_selected == "mouth"
- var/target_on_help_and_unarmed = target.a_intent == INTENT_HELP && !target.get_active_held_item()
- var/target_aiming_for_mouth = target.zone_selected == "mouth"
- var/target_restrained = target.restrained()
- if(aim_for_mouth && ( target_on_help_and_unarmed || target_restrained || target_aiming_for_mouth))
- playsound(target.loc, 'sound/weapons/slap.ogg', 50, 1, -1)
- user.visible_message("[user] slaps [target] in the face!",
- "You slap [target] in the face! ",\
- "You hear a slap.")
- target.endTailWag()
- return FALSE
- else if(target.check_block())
+ if(target.check_block())
target.visible_message("[target] blocks [user]'s disarm attempt!")
return 0
if(attacker_style && attacker_style.disarm_act(user,target))
diff --git a/code/modules/research/designs/smelting_designs.dm b/code/modules/research/designs/smelting_designs.dm
index 9367b38da7a..5c9c0f68313 100644
--- a/code/modules/research/designs/smelting_designs.dm
+++ b/code/modules/research/designs/smelting_designs.dm
@@ -4,7 +4,7 @@
name = "Plasma + Iron alloy"
id = "plasteel"
build_type = SMELTER
- materials = list(MAT_METAL = MINERAL_MATERIAL_AMOUNT / 2, MAT_PLASMA = MINERAL_MATERIAL_AMOUNT / 2)
+ materials = list(MAT_METAL = MINERAL_MATERIAL_AMOUNT, MAT_PLASMA = MINERAL_MATERIAL_AMOUNT)
build_path = /obj/item/stack/sheet/plasteel
category = list("initial")
@@ -13,7 +13,7 @@
name = "Plasma + Titanium alloy"
id = "plastitanium"
build_type = SMELTER
- materials = list(MAT_TITANIUM = MINERAL_MATERIAL_AMOUNT / 2, MAT_PLASMA = MINERAL_MATERIAL_AMOUNT / 2)
+ materials = list(MAT_TITANIUM = MINERAL_MATERIAL_AMOUNT, MAT_PLASMA = MINERAL_MATERIAL_AMOUNT)
build_path = /obj/item/stack/sheet/mineral/plastitanium
category = list("initial")
diff --git a/code/modules/ruins/objects_and_mobs/ash_walker_den.dm b/code/modules/ruins/objects_and_mobs/ash_walker_den.dm
index c59850198e3..0acfcc2a45b 100644
--- a/code/modules/ruins/objects_and_mobs/ash_walker_den.dm
+++ b/code/modules/ruins/objects_and_mobs/ash_walker_den.dm
@@ -12,6 +12,15 @@
loot = list(/obj/effect/gibspawner, /obj/item/device/assembly/signaler/anomaly)
del_on_death = 1
var/meat_counter
+ var/obj/effect/light_emitter/tendril/emitted_light
+
+/mob/living/simple_animal/hostile/spawner/ash_walker/Initialize()
+ . = ..()
+ emitted_light = new(loc)
+
+/mob/living/simple_animal/hostile/spawner/ash_walker/Destroy()
+ QDEL_NULL(emitted_light)
+ . = ..()
/mob/living/simple_animal/hostile/spawner/ash_walker/Life()
..()
diff --git a/html/changelog.html b/html/changelog.html
index 2d9e95ce776..451bf7fd683 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,45 @@
-->
+
08 June 2017
+
4dplanner updated:
+
+ - traitors show up on antagHUD
+
+
Joan updated:
+
+ - Tinkerer's Daemons are no longer totally disabled if you drop below the servant requirement.
+ - Instead, Tinkerer's Daemons will disable until the number of active daemons is equal to or less than one-fifth of the living Servants.
+ - Tinkerer's Daemons produce components very slightly slower.
+ - Added Prolonging Prism as an application scripture.
+ - Prolonging Prism will delay the arrival of an emergency shuttle by 2 minutes at the cost of 2500W of power plus 75W for every 10 CV and 750W for every previous activation. In addition to the high cost, it very obviously affects the shuttle dock and leaves an obvious trail to the prism.
+ - Script scripture now requires 6 Servants to unlock, from 5, and Application scripture now requires 9 Servants to unlock, from 8.
+
+
NanoTrasen Public Relations Department updated:
+
+ - A mining accident has released large amounts of space dust, which is starting to drift near our stations. Don't panic, it's probably safe.
+
+
Nanotrasen Plastic Surgery Advert updated:
+
+ - Are you a mutant? Were you born hideously deformed? Do you have ears growing out of the top of your head? Or even a tail? Don't worry, with our patented surgical techniques, Nanotrasen's highly trained medical staff can make you normal! Schedule an appointment, and one of our surgeons can see you same day.
+ - Cat ears now give you double the ear damage.
+
+
QualityVan updated:
+
+ - Cremators now still work when there's only one thing in them
+ - The ORM now uses the intended amount of resources when making alloys
+ - Cyborgs can no longer alt-click their material stacks to split them
+
+
Shadowlight213 updated:
+
+ - Tracking implants and chem implants have been added to rnd
+ - Adrenaline and freedom implants have been removed from rnd
+
+
oranges updated:
+
+ - Added stungloves to the brain damage lines
+
+
07 June 2017
Expletive updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index d3e692325e9..1dbe6c706ef 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -11741,3 +11741,37 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- balance: The Changeling Transformation Sting is once again stealthy. However,
it no longer transfers mutations.
- balance: The chemical cost of Transformation Sting has been increased to 50
+2017-06-08:
+ 4dplanner:
+ - bugfix: traitors show up on antagHUD
+ Joan:
+ - balance: Tinkerer's Daemons are no longer totally disabled if you drop below the
+ servant requirement.
+ - balance: Instead, Tinkerer's Daemons will disable until the number of active daemons
+ is equal to or less than one-fifth of the living Servants.
+ - tweak: Tinkerer's Daemons produce components very slightly slower.
+ - rscadd: Added Prolonging Prism as an application scripture.
+ - balance: Prolonging Prism will delay the arrival of an emergency shuttle by 2
+ minutes at the cost of 2500W of power plus 75W for every 10 CV and 750W for
+ every previous activation. In addition to the high cost, it very obviously affects
+ the shuttle dock and leaves an obvious trail to the prism.
+ - balance: Script scripture now requires 6 Servants to unlock, from 5, and Application
+ scripture now requires 9 Servants to unlock, from 8.
+ NanoTrasen Public Relations Department:
+ - rscadd: A mining accident has released large amounts of space dust, which is starting
+ to drift near our stations. Don't panic, it's probably safe.
+ Nanotrasen Plastic Surgery Advert:
+ - rscadd: Are you a mutant? Were you born hideously deformed? Do you have ears growing
+ out of the top of your head? Or even a tail? Don't worry, with our patented
+ surgical techniques, Nanotrasen's highly trained medical staff can make you
+ normal! Schedule an appointment, and one of our surgeons can see you same day.
+ - balance: Cat ears now give you double the ear damage.
+ QualityVan:
+ - bugfix: Cremators now still work when there's only one thing in them
+ - bugfix: The ORM now uses the intended amount of resources when making alloys
+ - rscdel: Cyborgs can no longer alt-click their material stacks to split them
+ Shadowlight213:
+ - rscadd: Tracking implants and chem implants have been added to rnd
+ - rscdel: Adrenaline and freedom implants have been removed from rnd
+ oranges:
+ - rscadd: Added stungloves to the brain damage lines
diff --git a/html/changelogs/AutoChangeLog-pr-28124.yml b/html/changelogs/AutoChangeLog-pr-28124.yml
deleted file mode 100644
index 3b02e2419b6..00000000000
--- a/html/changelogs/AutoChangeLog-pr-28124.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Shadowlight213"
-delete-after: True
-changes:
- - rscadd: "Tracking implants and chem implants have been added to rnd"
- - rscdel: "Adrenaline and freedom implants have been removed from rnd"
diff --git a/html/changelogs/AutoChangeLog-pr-28135.yml b/html/changelogs/AutoChangeLog-pr-28135.yml
deleted file mode 100644
index ed9579831e8..00000000000
--- a/html/changelogs/AutoChangeLog-pr-28135.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Joan"
-delete-after: True
-changes:
- - balance: "Tinkerer's Daemons are no longer totally disabled if you drop below the servant requirement."
- - balance: "Instead, Tinkerer's Daemons will disable until the number of active daemons is equal to or less than one-fifth of the living Servants."
- - tweak: "Tinkerer's Daemons produce components very slightly slower."
diff --git a/html/changelogs/AutoChangeLog-pr-28137.yml b/html/changelogs/AutoChangeLog-pr-28137.yml
new file mode 100644
index 00000000000..7ac18b1e849
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-28137.yml
@@ -0,0 +1,4 @@
+author: "Robustin"
+delete-after: True
+changes:
+ - balance: "The blood cult can only attempt to summon Nar-Sie in one of three rooms that are randomly selected at round-start."
diff --git a/html/changelogs/AutoChangeLog-pr-28142.yml b/html/changelogs/AutoChangeLog-pr-28142.yml
deleted file mode 100644
index 28434d00134..00000000000
--- a/html/changelogs/AutoChangeLog-pr-28142.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "NanoTrasen Public Relations Department"
-delete-after: True
-changes:
- - rscadd: "A mining accident has released large amounts of space dust, which is starting to drift near our stations. Don't panic, it's probably safe."
diff --git a/html/changelogs/AutoChangeLog-pr-28148.yml b/html/changelogs/AutoChangeLog-pr-28148.yml
deleted file mode 100644
index 850a69c2408..00000000000
--- a/html/changelogs/AutoChangeLog-pr-28148.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Nanotrasen Plastic Surgery Advert"
-delete-after: True
-changes:
- - rscadd: "Are you a mutant? Were you born hideously deformed? Do you have ears growing out of the top of your head? Or even a tail? Don't worry, with our patented surgical techniques, Nanotrasen's highly trained medical staff can make you normal! Schedule an appointment, and one of our surgeons can see you same day."
- - balance: "Cat ears now give you double the ear damage."
diff --git a/html/changelogs/AutoChangeLog-pr-28171.yml b/html/changelogs/AutoChangeLog-pr-28171.yml
new file mode 100644
index 00000000000..f7b64b0f08d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-28171.yml
@@ -0,0 +1,4 @@
+author: "lzimann"
+delete-after: True
+changes:
+ - rscdel: "Xeno queens can no longer be maids"
diff --git a/html/changelogs/AutoChangeLog-pr-28178.yml b/html/changelogs/AutoChangeLog-pr-28178.yml
new file mode 100644
index 00000000000..ff5abf73f1e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-28178.yml
@@ -0,0 +1,8 @@
+author: "Expletive"
+delete-after: True
+changes:
+ - tweak: "The detective's flask has Hearty Punch instead of whiskey."
+ - bugfix: "The Detective's fedora no longer clips with hair."
+ - imageadd: "Adds 91 new sprites to fix clipping issues with the Detective's fedora and hair."
+ - imageadd: "Change the standard fedora to match the detective and treasure hunter variants."
+ - tweak: "Detective, Treasure Hunter, and standard fedoras now all benefit from new sprites."
diff --git a/html/changelogs/AutoChangeLog-pr-28189.yml b/html/changelogs/AutoChangeLog-pr-28189.yml
new file mode 100644
index 00000000000..eeed3b359b0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-28189.yml
@@ -0,0 +1,4 @@
+author: "Xhuis"
+delete-after: True
+changes:
+ - tweak: "Defibrillator paddles will no longer stick to your hands, and will snap back onto the unit if you drop them somehow."
diff --git a/icons/effects/64x64.dmi b/icons/effects/64x64.dmi
index 361cfff40c0..d80b077988a 100644
Binary files a/icons/effects/64x64.dmi and b/icons/effects/64x64.dmi differ
diff --git a/icons/mob/alienqueen.dmi b/icons/mob/alienqueen.dmi
index 4b84210c5a7..115bd17cb0b 100644
Binary files a/icons/mob/alienqueen.dmi and b/icons/mob/alienqueen.dmi differ
diff --git a/icons/mob/hair_extensions.dmi b/icons/mob/hair_extensions.dmi
index cf74d73796c..bd2adda94bd 100644
Binary files a/icons/mob/hair_extensions.dmi and b/icons/mob/hair_extensions.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 26101a5dbc2..a9960f84d82 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/obj/clockwork_objects.dmi b/icons/obj/clockwork_objects.dmi
index 02e07435931..dc6f1e61439 100644
Binary files a/icons/obj/clockwork_objects.dmi and b/icons/obj/clockwork_objects.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index f170cf7f967..97e6e3a7532 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi
index 811c95536af..94f7b420f4b 100644
Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ
diff --git a/interface/menu.dm b/interface/menu.dm
index a2220d529fc..8e7045cb620 100644
--- a/interface/menu.dm
+++ b/interface/menu.dm
@@ -16,11 +16,6 @@ GLOBAL_LIST_EMPTY(menulist)
/datum/verbs/menu/GetList()
return GLOB.menulist
-/datum/verbs/menu/Generate_list()
- . = ..()
- for(var/I in .)
- .[I] = list2params(.[I])
-
/datum/verbs/menu/HandleVerb(list/entry, verbpath, client/C)
var/datum/verbs/menu/verb_true_parent = GLOB.menulist[verblist[verbpath]]
var/true_checkbox = verb_true_parent.checkbox
@@ -37,6 +32,7 @@ GLOBAL_LIST_EMPTY(menulist)
entry["command"] = ".updatemenuchecked \"[verb_true_parent.type]\" \"[verbpath]\"\n[entry["command"]]"
entry["can-check"] = TRUE
entry["group"] = "[verb_true_parent.type]"
+ return list2params(entry)
/datum/verbs/menu/proc/Get_checked(client/C)
return C.prefs.menuoptions[type] || default || FALSE
diff --git a/strings/brain_damage_lines.json b/strings/brain_damage_lines.json
index 6af0f4b8910..a1a44431dea 100644
--- a/strings/brain_damage_lines.json
+++ b/strings/brain_damage_lines.json
@@ -67,7 +67,8 @@
"kamelien",
"eksrey",
"glowey skin",
- "fungal tb"
+ "fungal tb",
+ "stun gloves"
],
"george": [
diff --git a/strings/tips.txt b/strings/tips.txt
index 591ba0c04b8..fa2bd82c395 100644
--- a/strings/tips.txt
+++ b/strings/tips.txt
@@ -150,11 +150,11 @@ As a Revolutionary, cargo can be your best friend or your worst nightmare. In th
As a Revolutionary, your main power comes from how quickly you spread. Convert people as fast as you can and overwhelm the heads of staff before security can arm up.
As a Changeling, the Extract DNA sting counts for your genome absorb objective, but does not let you respec your powers.
As a Changeling, you can absorb someone by strangling them and using the Absorb verb; this gives you the ability to rechoose your powers, the DNA of whoever you absorbed, the memory of the absorbed, and some samples of things the absorbed said.
-As a Cultist, invest in taking over xenobio, an adamantine golem army can quickly be converted into cultists and constructs.
As a Cultist, do not cause too much chaos before your objective is completed. If the shuttle gets called too soon, you may not have enough time to win.
As a Cultist, your team starts off very weak, but if necessary can quickly convert everything they have into raw power. Make sure you have the numbers and equipment to support going loud, or the cult will fall flat on its face.
As a Cultist, the Blood Boil rune will deal massive amounts of brute damage to non-cultists, stamina damage to Ratvarian scum, and some damage to fellow cultists of Nar-Sie nearby, but will create a fire where the rune stands on use.
As a Cultist, you can create an army of manifested goons using a combination of the Manifest rune, which creates homunculi from ghosts, and the Blood Drain rune, which drains life from anyone standing on any blood drain rune.
+As a Cultist or Servant, check the alert in the upper-right of your screen for all the details about your cult's current status and objective.
As a Servant, your Clockwork Slab fits in pockets and does not need to be held to communicate with other Servants.
As a Servant, remember that while the selection of scripture and tools Servant cyborgs get is limited, it is still extremely useful, and some of it is unique; for example, engineering and janitor cyborgs get a proselytizer that can use their own power in addition to its own.
As a Servant, the Judicial Visor is an effective defensive combat tool in small spaces, as it stuns and mutes anyone still on it after 3 seconds. It is also useful for stunning already-stunned enemies for long enough to convert them or finish them off.
@@ -172,7 +172,6 @@ As a Servant, Volt Void will drain power from nearby Sigils of Transmission to u
As a Servant, Fellowship Armory invokes much faster for each nearby servant and attempts to provide each affected servant with powerful armor against melee, bullet, and bomb attacks. The gauntlets provided are also immune to elecricity.
As a Servant, Spatial Gateway can teleport to any living Servant or Clockwork Obelisk, and gains additional uses and duration for each Servant assisting in the invocation.
As a Servant, creating and activating the Gateway to the Celestial Derelict is your ultimate goal, and you must defend it with all the tools you have available.
-As a Servant, once Ratvar has arrived, all of your tools gain a massive boost in power and will, in general, have no cost and work at double speed.
As a Servant, you can impale human targets with a Ratvarian Spear by pulling them, then attacking them. This does massive damage and stuns them, and should effectively win the fight.
As a Servant, Sentinel's Compromise can instantly return you or another Servant to a fighting state by converting half of all their brute, burn, and oxygen damage to toxin, effectively halving the damage they have. Clockwork Floors will also rapidly heal toxin damage in Servants, allowing the Compromise more effectiveness.
As a Servant, Belligerent and Taunting Tirade are extremely powerful for disabling and disrupting large groups of enemies, though they render you somewhat vulnerable, as Belligerent requires that you stand still, and Taunting Tirade makes you extremely obvious.
diff --git a/tgstation.dme b/tgstation.dme
index cb92e43c07e..94821635bdd 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -439,6 +439,7 @@
#include "code\game\gamemodes\clock_cult\clock_structures\interdiction_lens.dm"
#include "code\game\gamemodes\clock_cult\clock_structures\mania_motor.dm"
#include "code\game\gamemodes\clock_cult\clock_structures\ocular_warden.dm"
+#include "code\game\gamemodes\clock_cult\clock_structures\prolonging_prism.dm"
#include "code\game\gamemodes\clock_cult\clock_structures\ratvar_the_clockwork_justicar.dm"
#include "code\game\gamemodes\clock_cult\clock_structures\taunting_trail.dm"
#include "code\game\gamemodes\clock_cult\clock_structures\tinkerers_cache.dm"