This commit is contained in:
kingofkosmos
2019-10-19 22:17:50 +03:00
parent 2b62c3b0c6
commit 56b8461580
10 changed files with 25 additions and 25 deletions

View File

@@ -377,7 +377,7 @@ SUBSYSTEM_DEF(ticker)
for(var/i in GLOB.new_player_list) for(var/i in GLOB.new_player_list)
var/mob/dead/new_player/N = i var/mob/dead/new_player/N = i
if(N.new_character) if(N.new_character)
to_chat(N, "<span class='boldnotice'>Captainship not forced on anyone.</span>") to_chat(N, "<span class='notice'>Captainship not forced on anyone.</span>")
CHECK_TICK CHECK_TICK
/datum/controller/subsystem/ticker/proc/transfer_characters() /datum/controller/subsystem/ticker/proc/transfer_characters()

View File

@@ -38,7 +38,7 @@
if (prob(8)) if (prob(8))
to_chat(affected_mob, "<span class='danger'>Your head hurts.</span>") to_chat(affected_mob, "<span class='danger'>Your head hurts.</span>")
if (prob(9)) if (prob(9))
to_chat(affected_mob, "<span class='warning'>You feel a tingling sensation in your chest.</span>") to_chat(affected_mob, "<span class='danger'>You feel a tingling sensation in your chest.</span>")
if (prob(9)) if (prob(9))
to_chat(affected_mob, "<span class='danger'>You feel angry.</span>") to_chat(affected_mob, "<span class='danger'>You feel angry.</span>")
if(2) if(2)
@@ -50,7 +50,7 @@
if (prob(8)) if (prob(8))
to_chat(affected_mob, "<span class='danger'>Your skin feels loose.</span>") to_chat(affected_mob, "<span class='danger'>Your skin feels loose.</span>")
if (prob(10)) if (prob(10))
to_chat(affected_mob, "<span class='warning'>You feel very strange.</span>") to_chat(affected_mob, "<span class='danger'>You feel very strange.</span>")
if (prob(4)) if (prob(4))
to_chat(affected_mob, "<span class='danger'>You feel a stabbing pain in your head!</span>") to_chat(affected_mob, "<span class='danger'>You feel a stabbing pain in your head!</span>")
affected_mob.Unconscious(40) affected_mob.Unconscious(40)

View File

@@ -134,7 +134,7 @@ RLD
else else
if(silo_mats.on_hold()) if(silo_mats.on_hold())
if(user) if(user)
to_chat(user, "<span class='alert'>Mineral access is on hold, please contact the Quartermaster.</span>") to_chat(user, "<span class='alert'>Mineral access is on hold, please contact the quartermaster.</span>")
return FALSE return FALSE
if(!silo_mats.mat_container.has_materials(list(/datum/material/iron = 500), amount)) if(!silo_mats.mat_container.has_materials(list(/datum/material/iron = 500), amount))
if(user) if(user)
@@ -151,7 +151,7 @@ RLD
else else
if(silo_mats.on_hold()) if(silo_mats.on_hold())
if(user) if(user)
to_chat(user, "<span class='alert'>Mineral access is on hold, please contact the Quartermaster.</span>") to_chat(user, "<span class='alert'>Mineral access is on hold, please contact the quartermaster.</span>")
return FALSE return FALSE
. = silo_mats.mat_container.has_materials(list(/datum/material/iron = 500), amount) . = silo_mats.mat_container.has_materials(list(/datum/material/iron = 500), amount)
if(!. && user) if(!. && user)
@@ -854,10 +854,10 @@ RLD
///index, used in the attack self to get the type. stored here since it doesnt change ///index, used in the attack self to get the type. stored here since it doesnt change
var/list/choices = list() var/list/choices = list()
///index, used in the attack self to get the type. stored here since it doesnt change ///index, used in the attack self to get the type. stored here since it doesnt change
var/list/name_to_type = list() var/list/name_to_type = list()
/// ///
var/list/machinery_data = list("cost" = list(), "delay" = list()) var/list/machinery_data = list("cost" = list(), "delay" = list())
/obj/item/construction/plumbing/attack_self(mob/user) /obj/item/construction/plumbing/attack_self(mob/user)
..() ..()
if(!choices.len) if(!choices.len)
@@ -872,7 +872,7 @@ RLD
var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE)
if(!check_menu(user)) if(!check_menu(user))
return return
blueprint = name_to_type[choice] blueprint = name_to_type[choice]
playsound(src, 'sound/effects/pop.ogg', 50, FALSE) playsound(src, 'sound/effects/pop.ogg', 50, FALSE)
to_chat(user, "<span class='notice'>You change [name]s blueprint to '[choice]'.</span>") to_chat(user, "<span class='notice'>You change [name]s blueprint to '[choice]'.</span>")

View File

@@ -293,7 +293,7 @@ GENE SCANNER
max_damage += ", " //prelude the organ if we've already reported an organ max_damage += ", " //prelude the organ if we've already reported an organ
max_damage += organ.name //this just slaps the organ name into the string of text max_damage += organ.name //this just slaps the organ name into the string of text
else else
max_damage = "\t<span class='alert'>Non-Functional Organs: </span>" //our initial statement max_damage = "\t<span class='alert'>Non-Functional Organs: " //our initial statement
max_damage += organ.name max_damage += organ.name
else if(organ.damage > organ.high_threshold) else if(organ.damage > organ.high_threshold)
report_organs = TRUE report_organs = TRUE

View File

@@ -129,7 +129,7 @@
/obj/item/choice_beacon/augments/spawn_option(obj/choice,mob/living/M) /obj/item/choice_beacon/augments/spawn_option(obj/choice,mob/living/M)
new choice(get_turf(M)) new choice(get_turf(M))
to_chat(M, "<span class='hear'>You hear something crackle from the beacon for a moment before a voice speaks.</span> \"Please stand by for a message from S.E.L.F. Message as follows: <span class='bold'>Item request received. Your package has been transported, use the autosurgeon supplied to apply the upgrade.</span> Message ends.\"") to_chat(M, "<span class='hear'>You hear something crackle from the beacon for a moment before a voice speaks. \"Please stand by for a message from S.E.L.F. Message as follows: <b>Item request received. Your package has been transported, use the autosurgeon supplied to apply the upgrade.</b> Message ends.\"</span>")
/obj/item/skub /obj/item/skub
desc = "It's skub." desc = "It's skub."

View File

@@ -77,7 +77,7 @@
log_directed_talk(mob, H, input, LOG_ADMIN, "reply") log_directed_talk(mob, H, input, LOG_ADMIN, "reply")
message_admins("[key_name_admin(src)] replied to [key_name_admin(H)]'s [sender] message with: \"[input]\"") message_admins("[key_name_admin(src)] replied to [key_name_admin(H)]'s [sender] message with: \"[input]\"")
to_chat(H, "<span class='hear'>You hear something crackle in your ears for a moment before a voice speaks.</span> \"Please stand by for a message from [sender == "Syndicate" ? "your benefactor" : "Central Command"]. Message as follows[sender == "Syndicate" ? ", agent." : ":"] <span class='bold'>[input].</span> Message ends.\"") to_chat(H, "<span class='hear'>You hear something crackle in your ears for a moment before a voice speaks. \"Please stand by for a message from [sender == "Syndicate" ? "your benefactor" : "Central Command"]. Message as follows[sender == "Syndicate" ? ", agent." : ":"] <b>[input].</b> Message ends.\"</span>")
SSblackbox.record_feedback("tally", "admin_verb", 1, "Headset Message") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! SSblackbox.record_feedback("tally", "admin_verb", 1, "Headset Message") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

View File

@@ -4,13 +4,13 @@
show_name_in_check_antagonists = TRUE show_name_in_check_antagonists = TRUE
/datum/antagonist/space_dragon/greet() /datum/antagonist/space_dragon/greet()
to_chat(owner, "<b>I am Space Dragon, ex-space carp, and defender of the secrets of constellation, Draco.</b>") to_chat(owner, "<b>I am Space Dragon, ex-space carp, and defender of the secrets of constellation, Draco.\n\
to_chat(owner, "<b>Fabulous secret powers were revealed to me the day I held aloft a wizard's staff of change and said 'By the power of Draco, I have the power!'</b>") Fabulous secret powers were revealed to me the day I held aloft a wizard's staff of change and said 'By the power of Draco, I have the power!'\n\
to_chat(owner, "<b>The wizard was turned into the short-lived Pastry Cat while I became Space Dragon, the most powerful beast in the universe.</b>") The wizard was turned into the short-lived Pastry Cat while I became Space Dragon, the most powerful beast in the universe.\n\
to_chat(owner, "<b>Clicking a tile will shoot fire onto that tile.</b>") Clicking a tile will shoot fire onto that tile.\n\
to_chat(owner, "<b>Using Tail Sweep will let me get the better of those who come too close.</b>") Using Tail Sweep will let me get the better of those who come too close.\n\
to_chat(owner, "<b>Attacking dead bodies will allow me to gib them to restore health.</b>") Attacking dead bodies will allow me to gib them to restore health.\n\
to_chat(owner, "<b>From the wizard's writings, he had been studying this station and its hierarchy. From this, I know who leads the station, and will kill them so the station underlings see me as their new leader.</b>") From the wizard's writings, he had been studying this station and its hierarchy. From this, I know who leads the station, and will kill them so the station underlings see me as their new leader.</b>")
owner.announce_objectives() owner.announce_objectives()
SEND_SOUND(owner.current, sound('sound/magic/demon_attack1.ogg')) SEND_SOUND(owner.current, sound('sound/magic/demon_attack1.ogg'))

View File

@@ -163,8 +163,8 @@
throw_range = 3 throw_range = 3
/obj/item/grown/sunflower/attack(mob/M, mob/user) /obj/item/grown/sunflower/attack(mob/M, mob/user)
to_chat(M, "<font color='green'><b> [user] smacks you with a sunflower!</font><font color='yellow'><b>FLOWER POWER<b></font>") to_chat(M, "<font color='green'>[user] smacks you with a sunflower!<font color='orange'><b>FLOWER POWER!</b></font></font>")
to_chat(user, "<font color='green'>Your sunflower's </font><font color='yellow'><b>FLOWER POWER</b></font><font color='green'>strikes [M]!</font>") to_chat(user, "<font color='green'>Your sunflower's <font color='orange'><b>FLOWER POWER</b></font> strikes [M]!</font>")
// Moonflower // Moonflower
/obj/item/seeds/sunflower/moonflower /obj/item/seeds/sunflower/moonflower

View File

@@ -319,13 +319,13 @@
/mob/living/simple_animal/bot/mulebot/proc/buzz(type) /mob/living/simple_animal/bot/mulebot/proc/buzz(type)
switch(type) switch(type)
if(SIGH) if(SIGH)
audible_message("<span class='hear'>[src] makes a sighing buzz.</span>", "<span class='hear'>You hear an electronic buzzing sound.</span>") audible_message("<span class='hear'>[src] makes a sighing buzz.</span>")
playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, FALSE) playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, FALSE)
if(ANNOYED) if(ANNOYED)
audible_message("<span class='hear'>[src] makes an annoyed buzzing sound.</span>", "<span class='hear'>You hear an electronic buzzing sound.</span>") audible_message("<span class='hear'>[src] makes an annoyed buzzing sound.</span>")
playsound(loc, 'sound/machines/buzz-two.ogg', 50, FALSE) playsound(loc, 'sound/machines/buzz-two.ogg', 50, FALSE)
if(DELIGHT) if(DELIGHT)
audible_message("<span class='hear'>[src] makes a delighted ping!</span>", "<span class='hear'>You hear a ping.</span>") audible_message("<span class='hear'>[src] makes a delighted ping!</span>")
playsound(loc, 'sound/machines/ping.ogg', 50, FALSE) playsound(loc, 'sound/machines/ping.ogg', 50, FALSE)
@@ -593,7 +593,7 @@
/mob/living/simple_animal/bot/mulebot/proc/at_target() /mob/living/simple_animal/bot/mulebot/proc/at_target()
if(!reached_target) if(!reached_target)
radio_channel = RADIO_CHANNEL_SUPPLY //Supply channel radio_channel = RADIO_CHANNEL_SUPPLY //Supply channel
audible_message("<span class='hear'>[src] makes a chiming sound!</span>", "<span class='hear'>You hear a chime.</span>") audible_message("<span class='hear'>[src] makes a chiming sound!</span>")
playsound(loc, 'sound/machines/chime.ogg', 50, FALSE) playsound(loc, 'sound/machines/chime.ogg', 50, FALSE)
reached_target = 1 reached_target = 1

View File

@@ -579,7 +579,7 @@
return return
if(LAZYLEN(candidates)) if(LAZYLEN(candidates))
var/mob/dead/observer/C = pick(candidates) var/mob/dead/observer/C = pick(candidates)
to_chat(M, "<span class='boldnotice'>You have been noticed by a ghost, and it has possessed you!</span>") to_chat(M, "<span class='boldnotice'>You have been noticed by a ghost and it has possessed you!</span>")
var/oldkey = M.key var/oldkey = M.key
M.ghostize(0) M.ghostize(0)
M.key = C.key M.key = C.key