mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-01-05 15:02:56 +00:00
First commit towards the new objective system.
This commit is contained in:
@@ -15,9 +15,8 @@
|
||||
ticker.mode.traitors += H.mind
|
||||
H.mind.special_role = "traitor"
|
||||
|
||||
var/datum/objective/steal/steal_objective = new
|
||||
var/datum/objective/steal/nuke_disk/steal_objective = new
|
||||
steal_objective.owner = H.mind
|
||||
steal_objective.set_target("nuclear authentication disk")
|
||||
H.mind.objectives += steal_objective
|
||||
|
||||
var/datum/objective/hijack/hijack_objective = new
|
||||
|
||||
@@ -101,6 +101,26 @@
|
||||
return 1
|
||||
return 0
|
||||
|
||||
/mob/living/proc/check_contents_for_reagent(A)
|
||||
var/list/L = list()
|
||||
L += src.contents
|
||||
for(var/obj/item/weapon/storage/S in L)
|
||||
L |= S.return_inv()
|
||||
for(var/obj/item/weapon/gift/G in L)
|
||||
L |= G.gift
|
||||
if (istype(G.gift, /obj/item/weapon/storage))
|
||||
L |= G.gift:return_inv()
|
||||
for(var/obj/item/weapon/evidencebag/E in L)
|
||||
L |= E:contents
|
||||
for(var/obj/item/smallDelivery/S in L)
|
||||
L |= S.wrapped
|
||||
|
||||
for(var/obj/item/weapon/reagent_containers/B in L)
|
||||
for(var/datum/reagent/R in B.reagents.reagent_list)
|
||||
if(R.type == A)
|
||||
return 1
|
||||
return 0
|
||||
|
||||
|
||||
/mob/living/proc/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 1.0)
|
||||
return 0 //only carbon liveforms have this proc
|
||||
|
||||
@@ -265,7 +265,8 @@
|
||||
job_master.EquipRank(character, rank, 1)
|
||||
EquipCustomItems(character)
|
||||
character.loc = pick(latejoin)
|
||||
character.be_syndicate = src.preferences.be_special
|
||||
if(character.client)
|
||||
character.client.be_syndicate = preferences.be_special
|
||||
ticker.mode.latespawn(character)
|
||||
AnnounceArrival(character, rank)
|
||||
|
||||
|
||||
@@ -862,7 +862,6 @@ datum/preferences
|
||||
|
||||
character.age = age
|
||||
character.dna.b_type = b_type
|
||||
character.be_syndicate = be_special
|
||||
|
||||
character.r_eyes = r_eyes
|
||||
character.g_eyes = g_eyes
|
||||
@@ -906,6 +905,7 @@ datum/preferences
|
||||
character.client.ooccolor = ooccolor
|
||||
character.client.be_alien = be_special&BE_ALIEN
|
||||
character.client.be_pai = be_special&BE_PAI
|
||||
character.client.be_syndicate = be_special
|
||||
|
||||
proc/copydisabilities(mob/living/carbon/human/character)
|
||||
if(disabilities & 1)
|
||||
|
||||
Reference in New Issue
Block a user