cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 13:09:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolve conflicts, fix compile errors

Browse Source
This commit is contained in:
Meghan-Rossi
2019-12-19 17:49:21 +00:00
parent 3b7a737c08
commit 604fd1b74f
16 changed files with 24 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/resleeving/designer.dm
+3 -3
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)
code/modules/resleeving/infocore_records.dm
+1 -1
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)