April sync (#360)
* 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:
@@ -57,7 +57,7 @@
|
||||
|
||||
if(tr_flags & TR_KEEPSE)
|
||||
O.dna.struc_enzymes = dna.struc_enzymes
|
||||
var/datum/mutation/human/race/R = mutations_list[RACEMUT]
|
||||
var/datum/mutation/human/race/R = GLOB.mutations_list[RACEMUT]
|
||||
O.dna.struc_enzymes = R.set_se(O.dna.struc_enzymes, on=1)//we don't want to keep the race block inactive
|
||||
|
||||
if(suiciding)
|
||||
@@ -205,7 +205,7 @@
|
||||
|
||||
if(tr_flags & TR_KEEPSE)
|
||||
O.dna.struc_enzymes = dna.struc_enzymes
|
||||
var/datum/mutation/human/race/R = mutations_list[RACEMUT]
|
||||
var/datum/mutation/human/race/R = GLOB.mutations_list[RACEMUT]
|
||||
O.dna.struc_enzymes = R.set_se(O.dna.struc_enzymes, on=0)//we don't want to keep the race block active
|
||||
O.domutcheck()
|
||||
|
||||
@@ -308,24 +308,24 @@
|
||||
|
||||
/mob/proc/AIize(transfer_after = TRUE)
|
||||
if(client)
|
||||
stopLobbySound()
|
||||
stop_sound_channel(CHANNEL_LOBBYMUSIC)
|
||||
|
||||
var/turf/loc_landmark
|
||||
for(var/obj/effect/landmark/start/sloc in landmarks_list)
|
||||
for(var/obj/effect/landmark/start/sloc in GLOB.landmarks_list)
|
||||
if(sloc.name != "AI")
|
||||
continue
|
||||
if(locate(/mob/living/silicon/ai) in sloc.loc)
|
||||
continue
|
||||
loc_landmark = sloc.loc
|
||||
if(!loc_landmark)
|
||||
for(var/obj/effect/landmark/tripai in landmarks_list)
|
||||
for(var/obj/effect/landmark/tripai in GLOB.landmarks_list)
|
||||
if(tripai.name == "tripai")
|
||||
if(locate(/mob/living/silicon/ai) in tripai.loc)
|
||||
continue
|
||||
loc_landmark = tripai.loc
|
||||
if(!loc_landmark)
|
||||
to_chat(src, "Oh god sorry we can't find an unoccupied AI spawn location, so we're spawning you on top of someone.")
|
||||
for(var/obj/effect/landmark/start/sloc in landmarks_list)
|
||||
for(var/obj/effect/landmark/start/sloc in GLOB.landmarks_list)
|
||||
if (sloc.name == "AI")
|
||||
loc_landmark = sloc.loc
|
||||
|
||||
@@ -385,7 +385,7 @@
|
||||
|
||||
R.loc = loc
|
||||
R.job = "Cyborg"
|
||||
R.notify_ai(1)
|
||||
R.notify_ai(NEW_BORG)
|
||||
|
||||
. = R
|
||||
qdel(src)
|
||||
|
||||
Reference in New Issue
Block a user