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

Update global_lists.dm

Browse Source
This commit is contained in:
cadyn
2021-02-27 13:23:03 -08:00
committed by GitHub
parent dbc2902fc1
commit a815e7b384
1 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
code/_helpers/global_lists.dm
View File

@@ -93,8 +93,6 @@ var/global/list/string_slot_flags = list(
"holster" = SLOT_HOLSTER
)
<<<<<<< HEAD
//CHOMP Edit: This fix is taken from citadel station pr #2779. Fixes a "pretty horrific memory leak" that is called any time someone opens character creator.
GLOBAL_LIST_EMPTY(mannequins)
/proc/get_mannequin(var/ckey = "NULL")
var/mob/living/carbon/human/dummy/mannequin/M = GLOB.mannequins[ckey]
@@ -102,23 +100,6 @@ GLOBAL_LIST_EMPTY(mannequins)
GLOB.mannequins[ckey] = new /mob/living/carbon/human/dummy/mannequin(null)
M = GLOB.mannequins[ckey]
return M
||||||| parent of 881bc76902... Merge pull request #9805 from Verkister/blurgh
/proc/get_mannequin(var/ckey)
if(!mannequins_)
mannequins_ = new()
. = mannequins_[ckey]
if(!.)
. = new/mob/living/carbon/human/dummy/mannequin()
mannequins_[ckey] = .
=======
GLOBAL_LIST_EMPTY(mannequins)
/proc/get_mannequin(var/ckey = "NULL")
var/mob/living/carbon/human/dummy/mannequin/M = GLOB.mannequins[ckey]
if(!istype(M))
GLOB.mannequins[ckey] = new /mob/living/carbon/human/dummy/mannequin(null)
M = GLOB.mannequins[ckey]
return M
>>>>>>> 881bc76902... Merge pull request #9805 from Verkister/blurgh
//////////////////////////
/////Initial Building/////