cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-03 05:52:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into RoboCircuit

Browse Source
This commit is contained in:
PsiOmega
2014-11-27 08:58:34 +01:00
parent c14411d979 b24f074501
commit 5b8942543b
68 changed files with 13774 additions and 13604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/mob/hear_say.dm
View File

@@ -98,11 +98,8 @@
message = stars(message)
if(language)
verb = language.speech_verb
style = language.colour
if(hard_to_hear)
message = stars(message)

4
code/modules/mob/living/carbon/human/inventory.dm
View File

@@ -313,10 +313,10 @@
src << "\red You are trying to eqip this item to an unsupported inventory slot. How the heck did you manage that? Stop it..."
return
if(W == src.l_hand)
if((W == src.l_hand) && (slot != slot_l_hand))
src.l_hand = null
update_inv_l_hand() //So items actually disappear from hands.
else if(W == src.r_hand)
else if((W == src.r_hand) && (slot != slot_r_hand))
src.r_hand = null
update_inv_r_hand()

10
code/modules/mob/mob_helpers.dm
View File

@@ -247,11 +247,17 @@ var/list/global/organ_rel_size = list(
n = length(n)
var/p = null
p = 1
var/intag = 0
while(p <= n)
if ((copytext(te, p, p + 1) == " " || prob(pr)))
t = text("[][]", t, copytext(te, p, p + 1))
var/char = copytext(te, p, p + 1)
if (char == "<") //let's try to not break tags
intag = !intag
if (intag || char == " " || prob(pr))
t = text("[][]", t, char)
else
t = text("[]*", t)
if (char == ">")
intag = !intag
p++
return t

21
code/modules/mob/say.dm
View File

@@ -34,7 +34,6 @@
/mob/proc/say_dead(var/message)
var/name = src.real_name
var/alt_name = ""
if(say_disabled) //This is here to try to identify lag problems
usr << "\red Speech is currently admin-disabled."
@@ -54,22 +53,18 @@
else
name = real_name
if(name != real_name)
alt_name = " (died as [real_name])"
var/rendered = "<span class='game deadsay'><span class='prefix'>DEAD:</span> <span class='name'>[name]</span>[alt_name] [pick("complains","moans","whines","laments","blubbers")], <span class='message'>\"[message]\"</span></span>"
name += " (died as [real_name])"
for(var/mob/M in player_list)
if(istype(M, /mob/new_player))
continue
if(M.client && M.stat == DEAD && (M.client.prefs.toggles & CHAT_DEAD))
M << rendered
continue
if(M.client && M.client.holder && !is_mentor(M.client) && (M.client.prefs.toggles & CHAT_DEAD) ) // Show the message to admins/mods with deadchat toggled on
M << rendered //Admins can hear deadchat, if they choose to, no matter if they're blind/deaf or not.
return
if(M.client && (M.stat == DEAD || (M.client.holder && !is_mentor(M.client)) && (M.client.prefs.toggles & CHAT_DEAD)))
var/follow = ""
if(src != M)
follow = " (<a href='byond://?src=\ref[M];track=\ref[src]'>follow</a>)"
if(M.stat != DEAD && M.client.holder)
follow = " (<a href='?src=\ref[M.client.holder];adminplayerobservejump=\ref[src]'>JMP</a>)"
M << "<span class='game deadsay'><span class='prefix'>DEAD:</span> <span class='name'>[name]</span>[follow] [pick("complains","moans","whines","laments","blubbers")], <span class='message'>\"[message]\"</span></span>"
/mob/proc/say_understands(var/mob/other,var/datum/language/speaking = null)