From 9696c7dd83ed4fb22f16280a077307e391b8cc12 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Sun, 15 Oct 2017 16:04:16 -0200 Subject: [PATCH] Bugfixes: xeno loadout, vox mirror and worm crash (#3663) -might fix #3660 - Fixes #3666 -fixes some issues with the mirror -fixes worms crashing the server -might fix ringers --- code/game/machinery/kitchen/icecream.dm | 6 +++--- code/game/machinery/recharger.dm | 2 +- code/game/machinery/ringer.dm | 2 +- code/game/objects/structures/mirror.dm | 4 ++-- code/modules/client/preference_setup/loadout/loadout.dm | 2 +- code/modules/mob/living/simple_animal/hostile/sarlacc.dm | 6 +----- 6 files changed, 9 insertions(+), 13 deletions(-) diff --git a/code/game/machinery/kitchen/icecream.dm b/code/game/machinery/kitchen/icecream.dm index e3122ae13bc..35950cd8035 100644 --- a/code/game/machinery/kitchen/icecream.dm +++ b/code/game/machinery/kitchen/icecream.dm @@ -64,7 +64,7 @@ /obj/machinery/icecream_vat/Initialize() . = ..() create_reagents(100) - while(product_types.len < 6) + while(product_types.len < 8) product_types.Add(5) reagents.add_reagent("milk", 5) reagents.add_reagent("flour", 5) @@ -82,7 +82,7 @@ dat += "Vanilla icecream: Select Make x5 [product_types[ICECREAM_VANILLA]] scoops left. (Ingredients: milk, ice)
" dat += "Strawberry icecream: Select Make x5 [product_types[ICECREAM_STRAWBERRY]] dollops left. (Ingredients: milk, ice, berry juice)
" dat += "Chocolate icecream: Select Make x5 [product_types[ICECREAM_CHOCOLATE]] dollops left. (Ingredients: milk, ice, coco powder)
" - dat += "Blue icecream: Select Make x5 [product_types[ICECREAM_BLUE]] dollops left. (Ingredients: milk, ice, singulo)
" + dat += "Blue icecream: Select Make x5 [product_types[ICECREAM_BLUE]] dollops left. (Ingredients: milk, ice, singulo)
" dat += "Cherry icecream: Select Make x5 [product_types[ICECREAM_CHERRY]] dollops left. (Ingredients: milk, ice, cherry jelly)
" dat += "Banana icecream: Select Make x5 [product_types[ICECREAM_BANANA]] dollops left. (Ingredients: milk, ice, banana)
" dat += "
CONES
" @@ -92,7 +92,7 @@ dat += "VAT CONTENT
" for(var/datum/reagent/R in reagents.reagent_list) dat += "[R.name]: [R.volume]" - dat += "Purge
" + dat += "Purge
" dat += "Refresh Close" var/datum/browser/popup = new(user, "icecreamvat","Icecream Vat", 700, 500, src) diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index 08de1b9b798..3d9b1a4d754 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -82,7 +82,7 @@ charging = null update_icon() -/obj/machinery/recharger/process() +/obj/machinery/recharger/machinery_process() if(stat & (NOPOWER|BROKEN) || !anchored) update_use_power(0) icon_state = icon_state_idle diff --git a/code/game/machinery/ringer.dm b/code/game/machinery/ringer.dm index 2d7a59d116a..c3c369c91e3 100644 --- a/code/game/machinery/ringer.dm +++ b/code/game/machinery/ringer.dm @@ -100,7 +100,7 @@ addtimer(CALLBACK(src, .proc/unping), 45 SECONDS) -/obj/machinery/ringer/proc/unping(var/obj/item/device/pda/pda) +/obj/machinery/ringer/proc/unping() pinged = FALSE update_icon() diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 40d9a948e14..e6fab23344f 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -151,8 +151,8 @@ if(!newname || newname == "") var/datum/language/L = all_languages[user.species.default_language] newname = L.get_random_name() - user.real_name = newname - user.name = user.real_name + user.fully_replace_character_name(user.real_name,newname) user.h_style = "Short Vox Quills" user.f_style = "Shaved" + user.update_hair(0) ..() \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout.dm b/code/modules/client/preference_setup/loadout/loadout.dm index 6c8467ba6f9..d3a5900f1f1 100644 --- a/code/modules/client/preference_setup/loadout/loadout.dm +++ b/code/modules/client/preference_setup/loadout/loadout.dm @@ -64,7 +64,7 @@ var/list/gear_datums = list() continue if(G.whitelisted && preference_mob) for(var/species in G.whitelisted) - if(is_alien_whitelisted(preference_mob, species)) + if(is_alien_whitelisted(preference_mob, global.all_species[species])) . += gear_name break else diff --git a/code/modules/mob/living/simple_animal/hostile/sarlacc.dm b/code/modules/mob/living/simple_animal/hostile/sarlacc.dm index e519e3a47da..9405e276ad1 100644 --- a/code/modules/mob/living/simple_animal/hostile/sarlacc.dm +++ b/code/modules/mob/living/simple_animal/hostile/sarlacc.dm @@ -205,12 +205,8 @@ asleep = 1 icon_state = "sarlacc_asleep" sarlacc.deployed = 0 - var/make_loot = loot_count visible_message("With a contented heave, \the [src] slides into the earth and begins regurgitating several treasures before shutting tight.") - while(make_loot) - for(var/turf/simulated/floor/F in orange(1,src)) - new /obj/random/loot(F) - make_loot-- + new/obj/random/loot(get_turf(src)) /mob/living/simple_animal/hostile/greatworm/FindTarget() if(eating)