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

Steals and fixes a memory leak fix from the freeloaders

Browse Source
This commit is contained in:
Chompstation Bot
2021-02-27 15:06:52 +00:00
parent bfe487e41a
commit dbc2902fc1
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/_helpers/global_lists.dm
View File

@@ -93,6 +93,7 @@ var/global/list/string_slot_flags = list(
"holster" = SLOT_HOLSTER "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. //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) GLOBAL_LIST_EMPTY(mannequins)
/proc/get_mannequin(var/ckey = "NULL") /proc/get_mannequin(var/ckey = "NULL")
@@ -101,6 +102,23 @@ GLOBAL_LIST_EMPTY(mannequins)
GLOB.mannequins[ckey] = new /mob/living/carbon/human/dummy/mannequin(null) GLOB.mannequins[ckey] = new /mob/living/carbon/human/dummy/mannequin(null)
M = GLOB.mannequins[ckey] M = GLOB.mannequins[ckey]
return M 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///// /////Initial Building/////

3
code/modules/client/preference_setup/vore/02_size.dm
View File

@@ -45,7 +45,6 @@
character.weight_gain = pref.weight_gain character.weight_gain = pref.weight_gain
character.weight_loss = pref.weight_loss character.weight_loss = pref.weight_loss
character.fuzzy = pref.fuzzy character.fuzzy = pref.fuzzy
character.appearance_flags -= pref.fuzzy*PIXEL_SCALE
character.resize(pref.size_multiplier, animate = FALSE) character.resize(pref.size_multiplier, animate = FALSE)
/datum/category_item/player_setup_item/vore/size/content(var/mob/user) /datum/category_item/player_setup_item/vore/size/content(var/mob/user)
@@ -70,7 +69,7 @@
else if(href_list["toggle_fuzzy"]) else if(href_list["toggle_fuzzy"])
pref.fuzzy = pref.fuzzy ? 0 : 1; pref.fuzzy = pref.fuzzy ? 0 : 1;
return TOPIC_REFRESH return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["weight"]) else if(href_list["weight"])
var/new_weight = input(user, "Choose your character's relative body weight.\n\ var/new_weight = input(user, "Choose your character's relative body weight.\n\

3
code/modules/mob/living/carbon/human/update_icons.dm
View File

@@ -141,6 +141,9 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
var/desired_scale_y = size_multiplier * icon_scale_y var/desired_scale_y = size_multiplier * icon_scale_y
desired_scale_x *= species.icon_scale_x desired_scale_x *= species.icon_scale_x
desired_scale_y *= species.icon_scale_y desired_scale_y *= species.icon_scale_y
appearance_flags |= PIXEL_SCALE
if(fuzzy)
appearance_flags &= ~PIXEL_SCALE
//VOREStation Edit End //VOREStation Edit End
// Regular stuff again. // Regular stuff again.