diff --git a/objects/obj_pnunit/Alarm_5.gml b/objects/obj_pnunit/Alarm_5.gml index 5b964bff54..bc7b098daf 100644 --- a/objects/obj_pnunit/Alarm_5.gml +++ b/objects/obj_pnunit/Alarm_5.gml @@ -81,7 +81,8 @@ i=0; if (marine_dead[i]=0) and (unit.gene_seed_mutations.mucranoid==1) and (ally[i]=false){ var muck=floor(random(200))+1; if (muck=50){ //slime is armour destroyed due to mucranoid - if (array_contains(global.power_armour,unit.armour())){ + var _power_armour = ARR_power_armour; + if (array_contains(_power_armour,unit.armour())){ unit.update_armour("", false, false); obj_ncombat.mucra[marine_co[i]]=1; obj_ncombat.slime+=1; diff --git a/objects/obj_popup/Create_0.gml b/objects/obj_popup/Create_0.gml index 5607fab001..f01d097e4b 100644 --- a/objects/obj_popup/Create_0.gml +++ b/objects/obj_popup/Create_0.gml @@ -334,8 +334,9 @@ calculate_equipment_needs = function (){ // This checks to see if there is any more in the armoury if (req_armour=="Power Armour"){ - for (i=0;i0){ - for (var i=0;i1) and (bionic_count <=4)){ diff --git a/scripts/scr_unit_equip_functions/scr_unit_equip_functions.gml b/scripts/scr_unit_equip_functions/scr_unit_equip_functions.gml index baf98ea5a4..8d858e94dc 100644 --- a/scripts/scr_unit_equip_functions/scr_unit_equip_functions.gml +++ b/scripts/scr_unit_equip_functions/scr_unit_equip_functions.gml @@ -28,7 +28,7 @@ function scr_update_unit_armour(new_armour, from_armoury=true, to_armoury=true, if (_new_power_armour){ require_carpace=true; if (new_armour=="Power Armour"){ - armour_list = global.power_armour; + armour_list = ARR_power_armour; } } else if (new_armour="Terminator Armour"){ require_carpace=true;