cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-06 15:32:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjustments to alien acid. Aliens should no longer see invalid targets as one of their acid options when using the verb. Right clicking should give the invalid target message when appropriate.

Browse Source 
Made a bunch of other things acid proof. Bullets, lasers, runes, etc.
Aliens should no longer emote as male when they are gender neuter. Or maybe plural, who knows.
Tweaked respawn character verb. Hopefully it'll work on the live server now.
Minor Strike Team fix.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@689 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
noisomehollow@lycos.com
2010-12-22 02:54:52 +00:00
parent 0525c4aa69
commit d681b03581
16 changed files with 96 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/admin/verbs/randomverbs.dm
View File

@@ -290,9 +290,9 @@ They spawn as an assistant but there is no announcement. /N */
var/GKEY = input
var/GNAME = "none"
var/mob/dead/observer/GDEL //to properly delete the mob later on.
var/mob/dead/observer/GDEL //To properly delete the mob later on.
for(var/mob/dead/observer/G in world)
if(G.key==input)
if(G.key==input||GKEY)
GDEL = G
GNAME = G.real_name
else
@@ -321,7 +321,7 @@ They spawn as an assistant but there is no announcement. /N */
new_character.loc = spawn_here
new_character.real_name = GNAME
message_admins("\blue [key_name_admin(usr)] has respawned [GKEY] as [new_character.name].", 1) //Here so it doesn't null name if an admin re-spawns themselves.
message_admins("\blue [key_name_admin(usr)] has respawned [GKEY] as [new_character.name].", 1) //Here so it doesn't null client if an admin re-spawns themselves.
new_character.key = GKEY
// preferences.copy_to(new_character)
new_character.dna.ready_dna(new_character)

12
code/modules/admin/verbs/striketeam.dm
View File

@@ -58,12 +58,12 @@ var/global/sent_strike_team = 0
else
new_commando.age = rand(35,45)
new_commando.b_type = pick("A+", "A-", "B+", "B-", "AB+", "AB-", "O+", "O-")
new_commando.dna.ready_dna(new_commando) //creates DNA
new_commando.dna.ready_dna(new_commando) //Creates DNA
//Creates mind stuff.
new_commando.mind = new
new_commando.mind.current = new_commando
new_commando.mind.assigned_role = "Death Commando"
new_commando.mind.store_memory("<B>Nuke Code:</B> \red [nuke_code].")
new_commando.mind.store_memory("<B>Nuke Code:</B> \red [nuke_code].")//So they don't forget their code or mission.
new_commando.mind.store_memory("<B>Mission:</B> \red [input].")
del(STARTLOC)
@@ -107,8 +107,8 @@ var/global/sent_strike_team = 0
GUN.bullets = 7
new_commando.equip_if_possible(GUN, new_commando.slot_s_store)
// new_commando.equip_if_possible(new /obj/item/weapon/gun/energy/pulse_rifle(new_commando), new_commando.slot_l_hand)
//Commented out because Commandos now have their rifles spawn in front of them, along with operation manuals.
//Useful for copy pasta since I'm lazy.
/*Commented out because Commandos now have their rifles spawn in front of them, along with operation manuals.
Useful for copy pasta since I'm lazy.*/
var/obj/item/weapon/card/id/W = new(new_commando)
W.name = "[new_commando.real_name]'s ID Card"
@@ -120,8 +120,8 @@ var/global/sent_strike_team = 0
var/list/candidates = list() // Picks a random ghost for the role. Mostly a copy of alien burst code.
for(var/mob/dead/observer/G in world)
if(G.client)
// if(!G.client.holder && ((G.client.inactivity/10)/60) <= 5) //!G.client.holder means that whoever called/has the proc won't be added to the list.
if(((G.client.inactivity/10)/60) <= 5) //Removing it allows even the caller to jump in.
if(!G.client.holder && ((G.client.inactivity/10)/60) <= 5) //Whoever called/has the proc won't be added to the list.
// if(((G.client.inactivity/10)/60) <= 5) //Removing it allows even the caller to jump in. Good for testing.
candidates.Add(G)
if(candidates.len)
var/mob/dead/observer/G = pick(candidates)