mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-28 06:27:26 +01:00
Being aliens is now a character setting (should be on by default). Observing ghosts have that off by default, so don't forget to turn it on by using the new verb in the commands tab!
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@746 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -63,12 +63,13 @@
|
||||
var/list/candidates = list() // Picks a random ghost in the world to shove in the larva -- TLE
|
||||
for(var/mob/dead/observer/G in world)
|
||||
if(G.client)
|
||||
if(((G.client.inactivity/10)/60) <= 5)
|
||||
if(G.corpse) //hopefully will make adminaliums possible --Urist
|
||||
if(G.corpse.stat==2)
|
||||
if(G.client.be_alien)
|
||||
if(((G.client.inactivity/10)/60) <= 5)
|
||||
if(G.corpse) //hopefully will make adminaliums possible --Urist
|
||||
if(G.corpse.stat==2)
|
||||
candidates.Add(G)
|
||||
if(!G.corpse) //hopefully will make adminaliums possible --Urist
|
||||
candidates.Add(G)
|
||||
if(!G.corpse) //hopefully will make adminaliums possible --Urist
|
||||
candidates.Add(G)
|
||||
if(candidates.len)
|
||||
var/mob/dead/observer/G = pick(candidates)
|
||||
G.client.mob = new/mob/living/carbon/alien/larva(affected_mob.loc)
|
||||
|
||||
@@ -26,6 +26,7 @@
|
||||
var/karma_spent = 0
|
||||
var/ooccolor = "#b82e00" //only used for admins of host level, default is equal to admin default
|
||||
var/midis = 1 //Check if midis should be played for someone -- Urist
|
||||
var/be_alien = 0 //Check if that guy wants to be an alien -- Urist
|
||||
|
||||
authenticate = 0
|
||||
// comment out the line below when debugging locally to enable the options & messages menu
|
||||
|
||||
@@ -234,4 +234,14 @@ var/list/karma_spenders = list()
|
||||
isnegative = 0
|
||||
else
|
||||
isnegative = 1
|
||||
sql_report_karma(src, M, isnegative)
|
||||
sql_report_karma(src, M, isnegative)
|
||||
|
||||
/mob/dead/observer/verb/toggle_alien_candidate()
|
||||
set name = "Toggle Be Alien Candidate"
|
||||
set desc = "Determines whether you will or will not be an alien candidate when someone bursts."
|
||||
if(src.client.be_alien)
|
||||
src.client.be_alien = 0
|
||||
src << "You are now excluded from alien candidate lists until end of round."
|
||||
else if(!src.client.be_alien)
|
||||
src.client.be_alien = 1
|
||||
src << "You are now included in alien candidate lists until end of round."
|
||||
@@ -35,6 +35,7 @@ datum/preferences/proc/savefile_save(mob/user)
|
||||
F["underwear"] << src.underwear
|
||||
F["name_is_always_random"] << src.be_random_name
|
||||
F["UI"] << src.UI // Skie
|
||||
F["be_alien"] << src.be_alien // Urist
|
||||
F["midis"] << src.midis // Urist
|
||||
F["ooccolor"] << src.ooccolor // Urist
|
||||
|
||||
@@ -90,6 +91,7 @@ datum/preferences/proc/savefile_load(mob/user, var/silent = 1)
|
||||
F["underwear"] >> src.underwear
|
||||
F["name_is_always_random"] >> src.be_random_name
|
||||
F["UI"] >> src.UI // Skie
|
||||
F["be_alien"] >> src.be_alien // Urist
|
||||
F["midis"] >> src.midis // Urist
|
||||
F["ooccolor"] >> src.ooccolor // Urist
|
||||
return 1
|
||||
|
||||
@@ -6,6 +6,7 @@ datum/preferences
|
||||
|
||||
var/be_syndicate
|
||||
var/midis = 1
|
||||
var/be_alien = 1
|
||||
var/ooccolor = "#b82e00"
|
||||
var/be_random_name = 0
|
||||
var/underwear = 1
|
||||
@@ -360,6 +361,7 @@ datum/preferences
|
||||
dat += " <font color=\"#0000[num2hex(src.b_eyes, 2)]\">Blue</font> - <a href='byond://?src=\ref[user];preferences=1;b_eyes=input'>[src.b_eyes]</a>"
|
||||
*/
|
||||
dat += "<hr>"
|
||||
dat += "<b>Be alien candidate:</b> <a href=\"byond://?src=\ref[user];preferences=1;be_alien=input\"><b>[src.be_alien == 1 ? "Yes" : "No"]</b></a><br>"
|
||||
if(!jobban_isbanned(user, "Syndicate"))
|
||||
dat += "<b>Be syndicate?:</b> <a href =\"byond://?src=\ref[user];preferences=1;b_syndicate=1\"><b>[(src.be_syndicate ? "Yes" : "No")]</b></a><br>"
|
||||
else
|
||||
@@ -685,10 +687,10 @@ datum/preferences
|
||||
src.UI = 'screen1.dmi'
|
||||
|
||||
if (link_tags["midis"])
|
||||
if (src.midis)
|
||||
src.midis = 0
|
||||
else
|
||||
src.midis = 1
|
||||
src.midis = (src.midis+1)%2
|
||||
|
||||
if (link_tags["be_alien"])
|
||||
src.be_alien = (src.be_alien+1)%2
|
||||
|
||||
if (link_tags["underwear"])
|
||||
if(!IsGuestKey(user.key))
|
||||
@@ -838,6 +840,7 @@ datum/preferences
|
||||
spawn(10)
|
||||
character.client.midis = midis
|
||||
character.client.ooccolor = ooccolor
|
||||
character.client.be_alien = be_alien
|
||||
|
||||
/*
|
||||
|
||||
|
||||
Reference in New Issue
Block a user