shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

April sync (#360)

Browse Source 
* Maps and things no code/icons

* helpers defines globalvars

* Onclick world.dm orphaned_procs

* subsystems

Round vote and shuttle autocall done here too

* datums

* Game folder

* Admin - chatter modules

* clothing - mining

* modular computers - zambies

* client

* mob level 1

* mob stage 2 + simple_animal

* silicons n brains

* mob stage 3 + Alien/Monkey

* human mobs

* icons updated

* some sounds

* emitter y u no commit

* update tgstation.dme

* compile fixes

* travis fixes

Also removes Fast digest mode, because reasons.

* tweaks for travis Mentors are broke again

Also fixes Sizeray guns

* oxygen loss fix for vore code.

* removes unused code

* some code updates

* bulk fixes

* further fixes

* outside things

* whoops.

* Maint bar ported

* GLOBs.
This commit is contained in:
Poojawa
2017-04-13 23:37:00 -05:00
committed by GitHub
parent cdc32c98fa
commit 7e9b96a00f
1322 changed files with 174827 additions and 23888 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/mob_helpers.dm
+13 -25
View File
@@ -269,14 +269,13 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
/proc/findname(msg)
if(!istext(msg))
msg = "[msg]"
for(var/mob/M in mob_list)
for(var/mob/M in GLOB.mob_list)
if(M.real_name == msg)
return M
return 0
var/static/regex/firstname = new("^\[^\\s-\]+") //First word before whitespace or "-"
/mob/proc/first_name()
var/static/regex/firstname = new("^\[^\\s-\]+") //First word before whitespace or "-"
firstname.Find(real_name)
return firstname.match
@@ -327,7 +326,7 @@ var/static/regex/firstname = new("^\[^\\s-\]+") //First word before whitespace o
return 0
/proc/is_special_character(mob/M) // returns 1 for special characters and 2 for heroes of gamemode //moved out of admins.dm because things other than admin procs were calling this.
if(!ticker || !ticker.mode)
if(!SSticker || !SSticker.mode)
return 0
if(!istype(M))
return 0
@@ -347,30 +346,30 @@ var/static/regex/firstname = new("^\[^\\s-\]+") //First word before whitespace o
return 1
return 0
if(M.mind && M.mind.special_role)//If they have a mind and special role, they are some type of traitor or antagonist.
switch(ticker.mode.config_tag)
switch(SSticker.mode.config_tag)
if("revolution")
if((M.mind in ticker.mode.head_revolutionaries) || (M.mind in ticker.mode.revolutionaries))
if((M.mind in SSticker.mode.head_revolutionaries) || (M.mind in SSticker.mode.revolutionaries))
return 2
if("cult")
if(M.mind in ticker.mode.cult)
if(M.mind in SSticker.mode.cult)
return 2
if("nuclear")
if(M.mind in ticker.mode.syndicates)
if(M.mind in SSticker.mode.syndicates)
return 2
if("changeling")
if(M.mind in ticker.mode.changelings)
if(M.mind in SSticker.mode.changelings)
return 2
if("wizard")
if(M.mind in ticker.mode.wizards)
if(M.mind in SSticker.mode.wizards)
return 2
if("apprentice")
if(M.mind in ticker.mode.apprentices)
if(M.mind in SSticker.mode.apprentices)
return 2
if("monkey")
if(M.viruses && (locate(/datum/disease/transformation/jungle_fever) in M.viruses))
return 2
if("abductor")
if(M.mind in ticker.mode.abductors)
if(M.mind in SSticker.mode.abductors)
return 2
return 1
return 0
@@ -381,7 +380,7 @@ var/static/regex/firstname = new("^\[^\\s-\]+") //First word before whitespace o
/proc/notify_ghosts(var/message, var/ghost_sound = null, var/enter_link = null, var/atom/source = null, var/image/alert_overlay = null, var/action = NOTIFY_JUMP, flashwindow = TRUE) //Easy notification of ghosts.
if(SSatoms.initialized != INITIALIZATION_INNEW_REGULAR) //don't notify for objects created during a map load
return
for(var/mob/dead/observer/O in player_list)
for(var/mob/dead/observer/O in GLOB.player_list)
if(O.client)
to_chat(O, "<span class='ghostalert'>[message][(enter_link) ? " [enter_link]" : ""]<span>")
if(ghost_sound)
@@ -464,17 +463,6 @@ var/static/regex/firstname = new("^\[^\\s-\]+") //First word before whitespace o
message_admins("No ghosts were willing to take control of [key_name_admin(M)])")
return FALSE
//toggles the talk wheel
/mob/verb/toggle_talk_wheel()
set name = "talk-wheel"
set hidden = 1
if(isliving(src))
var/mob/living/L = src
if(L.hud_used)
for(var/obj/screen/wheel/talk/TW in L.hud_used.wheels)
TW.Click()
/mob/proc/is_flying(mob/M = src)
if(M.movement_type & FLYING)
return 1
@@ -499,4 +487,4 @@ var/static/regex/firstname = new("^\[^\\s-\]+") //First word before whitespace o
var/list/timestamped_message = list("[LAZYLEN(logging[message_type]) + 1]\[[time_stamp()]\] [key_name(src)]" = message)
logging[message_type] += timestamped_message
logging[message_type] += timestamped_message