Minor bugfixes july update (#5029)

-fixes warform powers having no cooldown
-fixes dionae random names being broken
-fixes an incorrect check in laptops and trays
-gives siik'tau an unique color
This commit is contained in:
Alberyk
2018-07-23 17:05:41 -03:00
committed by Erki
parent e7fc543189
commit 8861211d8e
6 changed files with 14 additions and 16 deletions

View File

@@ -214,7 +214,7 @@
return 1 return 1
/obj/item/weapon/tray/AltClick(var/mob/user) /obj/item/weapon/tray/AltClick(var/mob/user)
if (!use_check(user, show_messages = FALSE)) return if (use_check(user, show_messages = FALSE)) return
unload(user) unload(user)
/obj/item/weapon/tray/proc/attempt_load_item(var/obj/item/I, var/mob/user, var/messages = 1) /obj/item/weapon/tray/proc/attempt_load_item(var/obj/item/I, var/mob/user, var/messages = 1)

View File

@@ -130,6 +130,7 @@
speech_verb = "slurs" speech_verb = "slurs"
ask_verb = "mrowmbles" ask_verb = "mrowmbles"
exclaim_verb = "exclaims" exclaim_verb = "exclaims"
colour = "siiktau"
key = "t" key = "t"
flags = WHITELISTED flags = WHITELISTED
syllables = list("m'Rr","rr","tahjr","kir","rrahj","kii","mirr","krah","ahhk","nahl","vahh","khahz","jri","rahn","dahrr", syllables = list("m'Rr","rr","tahjr","kir","rrahj","kii","mirr","krah","ahhk","nahl","vahh","khahz","jri","rahn","dahrr",

View File

@@ -573,14 +573,14 @@
set desc = "Charge forward, trampling anything in your path until you hit something more stubborn than you are." set desc = "Charge forward, trampling anything in your path until you hit something more stubborn than you are."
if(last_special > world.time) if(last_special > world.time)
to_chat(src, "<span class='danger'>You are too tired to charge!.</span>") to_chat(src, "<span class='danger'>You are too tired to charge!</span>")
return return
if(stat || paralysis || stunned || weakened || lying || restrained() || buckled) if(stat || paralysis || stunned || weakened || lying || restrained() || buckled)
to_chat(src, "<span class='danger'>You cannot charge in your current state!.</span>") to_chat(src, "<span class='danger'>You cannot charge in your current state!</span>")
return return
last_special = world.time last_special = world.time + 200
src.visible_message("<span class='warning'>\The [src] takes a step backwards and rears up.</span>", src.visible_message("<span class='warning'>\The [src] takes a step backwards and rears up.</span>",
"<span class='notice'>You take a step backwards and then...</span>") "<span class='notice'>You take a step backwards and then...</span>")
@@ -666,19 +666,21 @@
set desc = "Emit a powerful screech which stuns hearers in a two-tile radius." set desc = "Emit a powerful screech which stuns hearers in a two-tile radius."
if(last_special > world.time) if(last_special > world.time)
to_chat(src, "<span class='danger'>You are too tired to screech!.</span>") to_chat(src, "<span class='danger'>You are too tired to screech!</span>")
return return
if(stat || paralysis || stunned || weakened) if(stat || paralysis || stunned || weakened)
to_chat(src, "<span class='danger'>You cannot screech in your current state!.</span>") to_chat(src, "<span class='danger'>You cannot screech in your current state!</span>")
return return
last_special = world.time last_special = world.time + 200
visible_message("<span class='danger'>[src.name] lets out an ear piercing shriek!</span>", visible_message("<span class='danger'>[src.name] lets out an ear piercing shriek!</span>",
"<span class='danger'>You let out an ear-shattering shriek!</span>", "<span class='danger'>You let out an ear-shattering shriek!</span>",
"<span class='danger'>You hear a painfully loud shriek!</span>") "<span class='danger'>You hear a painfully loud shriek!</span>")
playsound(loc, 'sound/voice/shriek1.ogg', 100, 1)
var/list/victims = list() var/list/victims = list()
for (var/mob/living/carbon/human/T in hearers(2, src)) for (var/mob/living/carbon/human/T in hearers(2, src))
@@ -702,8 +704,6 @@
for (var/obj/machinery/light/L in view(4)) for (var/obj/machinery/light/L in view(4))
L.broken() L.broken()
playsound(loc, 'sound/voice/shriek1.ogg', 100, 1)
if (victims.len) if (victims.len)
admin_attacker_log_many_victims(src, victims, "used rebel yell to stun", "was stunned by [key_name(src)] using rebel yell", "used rebel yell to stun") admin_attacker_log_many_victims(src, victims, "used rebel yell to stun", "was stunned by [key_name(src)] using rebel yell", "used rebel yell to stun")
@@ -713,14 +713,14 @@
set desc = "Spew a cone of ignited napalm in front of you" set desc = "Spew a cone of ignited napalm in front of you"
if(last_special > world.time) if(last_special > world.time)
to_chat(src,"<span class='notice'>You are too tired to spray napalm.</span>") to_chat(src,"<span class='notice'>You are too tired to spray napalm!</span>")
return return
if(stat || paralysis || stunned || weakened || lying || restrained() || buckled) if(stat || paralysis || stunned || weakened || lying || restrained() || buckled)
to_chat(src,"<span class='notice'>You cannot spray napalm in your current state.</span>") to_chat(src,"<span class='notice'>You cannot spray napalm in your current state.</span>")
return return
last_special = world.time last_special = world.time + 200
playsound(loc, 'sound/species/shadow/grue_screech.ogg', 100, 1) playsound(loc, 'sound/species/shadow/grue_screech.ogg', 100, 1)
visible_message("<span class='danger'>\The [src] unleashes a torrent of raging flame!</span>", visible_message("<span class='danger'>\The [src] unleashes a torrent of raging flame!</span>",
"<span class='danger'>You unleash a gust of fire!</span>", "<span class='danger'>You unleash a gust of fire!</span>",

View File

@@ -366,10 +366,6 @@
return 1 return 1
return 0 return 0
/datum/species/diona/get_random_name(var/gender)
var/datum/language/species_language = all_languages[default_language]
return species_language.get_random_name()
/datum/species/diona/equip_survival_gear(var/mob/living/carbon/human/H) /datum/species/diona/equip_survival_gear(var/mob/living/carbon/human/H)
var/obj/item/device/flashlight/flare/F = new /obj/item/device/flashlight/flare(H) var/obj/item/device/flashlight/flare/F = new /obj/item/device/flashlight/flare(H)
if(H.backbag == 1) if(H.backbag == 1)

View File

@@ -16,7 +16,7 @@
var/icon_state_closed = "laptop-closed" var/icon_state_closed = "laptop-closed"
/obj/item/modular_computer/laptop/AltClick() /obj/item/modular_computer/laptop/AltClick()
if (!use_check(usr, show_messages = FALSE)) return if (use_check(usr, show_messages = FALSE)) return
// Prevents carrying of open laptops inhand. // Prevents carrying of open laptops inhand.
// While they work inhand, i feel it'd make tablets lose some of their high-mobility advantage they have over laptops now. // While they work inhand, i feel it'd make tablets lose some of their high-mobility advantage they have over laptops now.
if(!istype(loc, /turf/)) if(!istype(loc, /turf/))

View File

@@ -99,6 +99,7 @@ h1.alert, h2.alert {color: #000000;}
.say_quote {font-family: Georgia, Verdana, sans-serif;} .say_quote {font-family: Georgia, Verdana, sans-serif;}
.yassa {color: #400987;} .yassa {color: #400987;}
.delvahhi {color: #5E2612; font-weight: bold;} .delvahhi {color: #5E2612; font-weight: bold;}
.siiktau {color: #A52A2A;}
.interface {color: #330033;} .interface {color: #330033;}