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:
Poojawa
@@ -25,45 +25,45 @@ proc/get_racelist(var/mob/user)//This proc returns a list of species that 'user'
|
||||
var/datum/species/S = new spath()
|
||||
var/list/wlist = S.whitelist
|
||||
if(S.whitelisted && (wlist.Find(user.ckey) || wlist.Find(user.key) || user.client.holder)) //If your ckey is on the species whitelist or you're an admin:
|
||||
whitelisted_species_list[S.id] = S.type //Add the species to their available species list.
|
||||
GLOB.whitelisted_species_list[S.id] = S.type //Add the species to their available species list.
|
||||
else if(!S.whitelisted && S.roundstart) //Normal roundstart species will be handled here.
|
||||
whitelisted_species_list[S.id] = S.type
|
||||
GLOB.whitelisted_species_list[S.id] = S.type
|
||||
|
||||
return whitelisted_species_list
|
||||
return GLOB.whitelisted_species_list
|
||||
|
||||
//Mammal Species
|
||||
var/global/list/mam_body_markings_list = list()
|
||||
var/global/list/mam_ears_list = list()
|
||||
var/global/list/mam_tails_list = list()
|
||||
var/global/list/mam_tails_animated_list = list()
|
||||
var/global/list/taur_list = list()
|
||||
GLOBAL_LIST_EMPTY(mam_body_markings_list)
|
||||
GLOBAL_LIST_EMPTY(mam_ears_list)
|
||||
GLOBAL_LIST_EMPTY(mam_tails_list)
|
||||
GLOBAL_LIST_EMPTY(mam_tails_animated_list)
|
||||
GLOBAL_LIST_EMPTY(taur_list)
|
||||
|
||||
//Exotic Species
|
||||
var/global/list/exotic_tails_list = list()
|
||||
var/global/list/exotic_tails_animated_list = list()
|
||||
var/global/list/exotic_ears_list = list()
|
||||
var/global/list/exotic_head_list = list()
|
||||
var/global/list/exotic_back_list = list()
|
||||
GLOBAL_LIST_EMPTY(exotic_tails_list)
|
||||
GLOBAL_LIST_EMPTY(exotic_tails_animated_list)
|
||||
GLOBAL_LIST_EMPTY(exotic_ears_list)
|
||||
GLOBAL_LIST_EMPTY(exotic_head_list)
|
||||
GLOBAL_LIST_EMPTY(exotic_back_list)
|
||||
|
||||
//Xenomorph Species
|
||||
var/global/list/xeno_head_list = list() //I forgot the ' = list()' part for the longest time and couldn't figure out what was wrong. *facepalm
|
||||
var/global/list/xeno_tail_list = list()
|
||||
var/global/list/xeno_dorsal_list = list()
|
||||
GLOBAL_LIST_EMPTY(xeno_head_list)
|
||||
GLOBAL_LIST_EMPTY(xeno_tail_list)
|
||||
GLOBAL_LIST_EMPTY(xeno_dorsal_list)
|
||||
|
||||
|
||||
//Genitals and Arousal Lists
|
||||
var/global/list/cock_shapes_list = list()//global_lists.dm for the list initializations
|
||||
var/global/list/breasts_size_list = list()
|
||||
var/global/list/cum_into_containers_list = list(/obj/item/weapon/reagent_containers/food/snacks/pie)
|
||||
var/global/list/dick_nouns = list("dick","cock","member","shaft")
|
||||
var/global/list/cum_id_list = list("semen")
|
||||
var/global/list/milk_id_list = list("milk")
|
||||
GLOBAL_LIST_EMPTY(cock_shapes_list)//global_lists.dm for the list initializations //Now also _DATASTRUCTURES globals.dm
|
||||
GLOBAL_LIST_EMPTY(breasts_size_list)
|
||||
GLOBAL_LIST_INIT(cum_into_containers_list, /obj/item/weapon/reagent_containers/food/snacks/pie) //Yer fuggin snowflake name list jfc
|
||||
GLOBAL_LIST_INIT(dick_nouns, list("dick","cock","member","shaft"))
|
||||
GLOBAL_LIST_INIT(cum_id_list,"semen")
|
||||
GLOBAL_LIST_INIT(milk_id_list,"milk")
|
||||
//mentor stuff
|
||||
var/list/mentors = list()
|
||||
GLOBAL_LIST_EMPTY(mentors)
|
||||
|
||||
//Looc stuff
|
||||
var/global/looc_allowed = 1
|
||||
var/global/dlooc_allowed = 1
|
||||
GLOBAL_VAR_INIT(looc_allowed, 1)
|
||||
GLOBAL_VAR_INIT(dlooc_allowed, 1)
|
||||
|
||||
/client/proc/reload_mentors()
|
||||
set name = "Reload Mentors"
|
||||
@@ -103,19 +103,19 @@ var/global/dlooc_allowed = 1
|
||||
|
||||
/proc/toggle_looc(toggle = null)
|
||||
if(toggle != null) //if we're specifically en/disabling ooc
|
||||
if(toggle != looc_allowed)
|
||||
looc_allowed = toggle
|
||||
if(toggle != GLOB.looc_allowed)
|
||||
GLOB.looc_allowed = toggle
|
||||
else
|
||||
return
|
||||
else //otherwise just toggle it
|
||||
looc_allowed = !looc_allowed
|
||||
world << "<B>The LOOC channel has been globally [looc_allowed ? "enabled" : "disabled"].</B>"
|
||||
GLOB.looc_allowed = !GLOB.looc_allowed
|
||||
world << "<B>The LOOC channel has been globally [GLOB.looc_allowed ? "enabled" : "disabled"].</B>"
|
||||
|
||||
/datum/admins/proc/toggleloocdead()
|
||||
set category = "Server"
|
||||
set desc="Toggle dis bitch"
|
||||
set name="Toggle Dead LOOC"
|
||||
dlooc_allowed = !( dlooc_allowed )
|
||||
GLOB.dlooc_allowed = !( GLOB.dlooc_allowed )
|
||||
|
||||
log_admin("[key_name(usr)] toggled Dead LOOC.")
|
||||
message_admins("[key_name_admin(usr)] toggled Dead LOOC.")
|
||||
@@ -185,7 +185,7 @@ var/global/dlooc_allowed = 1
|
||||
|
||||
log_admin("[src] gave everyone genitals.")
|
||||
message_admins("[src] gave everyone genitals.")
|
||||
for(var/mob/living/carbon/human/H in mob_list)
|
||||
for(var/mob/living/carbon/human/H in GLOB.mob_list)
|
||||
if(H.gender == MALE)
|
||||
H.give_penis()
|
||||
H.give_balls()
|
||||
@@ -201,7 +201,7 @@ var/global/dlooc_allowed = 1
|
||||
|
||||
log_admin("[src] turned everyone into mammals.")
|
||||
message_admins("[src] turned everyone into mammals.")
|
||||
for(var/mob/living/carbon/human/H in mob_list)
|
||||
for(var/mob/living/carbon/human/H in GLOB.mob_list)
|
||||
if(!H.dna)
|
||||
continue
|
||||
var/datum/dna/hdna = H.dna
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
if(canbearoused && dna)
|
||||
var/datum/species/S
|
||||
S = dna.species
|
||||
if(S && SSmob.times_fired%36==2 && getArousalLoss() < max_arousal)//Totally stolen from breathing code. Do this every 36 ticks.
|
||||
if(S && SSmobs.times_fired%36==2 && getArousalLoss() < max_arousal)//Totally stolen from breathing code. Do this every 36 ticks.
|
||||
adjustArousalLoss(arousal_rate * S.arousal_gain_rate)
|
||||
if(dna.features["exhibitionist"])
|
||||
var/amt_nude = 0
|
||||
@@ -255,8 +255,8 @@
|
||||
finished = 1
|
||||
|
||||
else//not into a container
|
||||
src.visible_message("<span class='danger'>[src] starts [pick("jerking off","stroking")] their [pick(dick_nouns)].</span>", \
|
||||
"<span class='userdanger'>You start jerking off your [pick(dick_nouns)].</span>", \
|
||||
src.visible_message("<span class='danger'>[src] starts [pick("jerking off","stroking")] their [pick(GLOB.dick_nouns)].</span>", \
|
||||
"<span class='userdanger'>You start jerking off your [pick(GLOB.dick_nouns)].</span>", \
|
||||
"<span class='userdanger'>You start masturbating.</span>")
|
||||
if(do_after(src, mb_time, target = src))
|
||||
if(total_cum > 5)
|
||||
|
||||
@@ -211,7 +211,7 @@
|
||||
var/datum/sprite_accessory/S
|
||||
switch(G.type)
|
||||
if(/obj/item/organ/genital/penis)
|
||||
S = cock_shapes_list[G.shape]
|
||||
S = GLOB.cock_shapes_list[G.shape]
|
||||
size = G.size
|
||||
|
||||
if(!S || S.icon_state == "none")
|
||||
|
||||
Reference in New Issue
Block a user