cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Hawk_v3
2019-12-21 21:57:49 +00:00
parent 06a47d15d5 8b9806c8c4
commit 6b935d64ec
192 changed files with 7436 additions and 5475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/resleeving/designer.dm
View File

@@ -68,8 +68,8 @@
if(menu == "3")
var/stock_bodyrecords_list_ui[0]
for (var/N in all_species)
var/datum/species/S = all_species[N]
for (var/N in GLOB.all_species)
var/datum/species/S = GLOB.all_species[N]
if((S.spawn_flags & (SPECIES_IS_WHITELISTED|SPECIES_CAN_JOIN)) != SPECIES_CAN_JOIN) continue
stock_bodyrecords_list_ui += N
if(stock_bodyrecords_list_ui.len)
@@ -172,7 +172,7 @@
temp = "ERROR: Record missing."
else if(href_list["view_stock_brec"])
var/datum/species/S = all_species[href_list["view_stock_brec"]]
var/datum/species/S = GLOB.all_species[href_list["view_stock_brec"]]
if(S && (S.spawn_flags & (SPECIES_IS_WHITELISTED|SPECIES_CAN_JOIN)) == SPECIES_CAN_JOIN)
// Generate body record from species!
mannequin = new(null, S.name)

2
code/modules/resleeving/infocore_records.dm
View File

@@ -108,7 +108,7 @@
locked = ckeylock
//Prevent people from printing restricted and whitelisted species
var/datum/species/S = all_species["[M.dna.species]"]
var/datum/species/S = GLOB.all_species["[M.dna.species]"]
if(S)
toocomplex = (S.spawn_flags & SPECIES_IS_WHITELISTED) || (S.spawn_flags & SPECIES_IS_RESTRICTED)

2
code/modules/resleeving/infomorph.dm
View File

@@ -563,7 +563,7 @@ var/global/list/default_infomorph_software = list()
if(print_flavor_text()) msg += "\n[print_flavor_text()]\n"
if (pose)
if( findtext(pose,".",lentext(pose)) == 0 && findtext(pose,"!",lentext(pose)) == 0 && findtext(pose,"?",lentext(pose)) == 0 )
if( findtext(pose,".",length(pose)) == 0 && findtext(pose,"!",length(pose)) == 0 && findtext(pose,"?",length(pose)) == 0 )
pose = addtext(pose,".") //Makes sure all emotes end with a period.
msg += "\nIt is [pose]"