diff --git a/code/game/gamemodes/heist/heist.dm b/code/game/gamemodes/heist/heist.dm index 554721ff40e..164ff065758 100644 --- a/code/game/gamemodes/heist/heist.dm +++ b/code/game/gamemodes/heist/heist.dm @@ -134,7 +134,7 @@ var/global/list/obj/cortical_stacks = list() //Stacks for 'leave nobody behind' return 0 for(var/obj/stack in cortical_stacks) - if (get_area(stack) != locate(/area/shuttle/vox/station)) + if (get_area(stack.loc) != locate(/area/shuttle/vox/station)) return 0 return 1 diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index d5d1705dae5..6e8df50c0e7 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -342,7 +342,7 @@ if(istype(src, /obj/item/clothing/under) || istype(src, /obj/item/clothing/suit)) if(FAT in H.mutations) - testing("[M] TOO FAT TO WEAR [src]!") + //testing("[M] TOO FAT TO WEAR [src]!") if(!(flags & ONESIZEFITSALL)) if(!disable_warning) H << "\red You're too fat to wear the [name]." diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 892a5e3e9f8..6a1565f8b91 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -210,10 +210,18 @@ /obj/item/weapon/card/id/syndicate name = "agent card" - access = list(access_maint_tunnels, access_syndicate, access_external_airlocks) + var/list/initial_access = list(access_maint_tunnels, access_syndicate, access_external_airlocks) origin_tech = "syndicate=3" var/registered_user = null - + +/obj/item/weapon/card/id/syndicate/New() + access = initial_access.Copy() + ..() + +/obj/item/weapon/card/id/syndicate/vox + name = "agent card" + initial_access = list(access_maint_tunnels, access_vox, access_external_airlocks) + /obj/item/weapon/card/id/syndicate/afterattack(var/obj/item/weapon/O as obj, mob/user as mob, proximity) if(!proximity) return @@ -408,7 +416,7 @@ blood_type = initial(blood_type) dna_hash = initial(dna_hash) fingerprint_hash = initial(fingerprint_hash) - access = initial(access) + access = initial_access.Copy() // Initial() doesn't work on lists registered_user = null user << "All information has been deleted from \the [src]." diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 595bd5cad2d..467bceac1b8 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -47,6 +47,7 @@ /obj/Destroy() machines -= src processing_objects -= src + nanomanager.close_uis(src) return ..() /obj/item/proc/is_used_on(obj/O, mob/user) diff --git a/code/modules/admin/verbs/striketeam_syndicate.dm b/code/modules/admin/verbs/striketeam_syndicate.dm index f9ea83e4ba9..3113e58c2be 100644 --- a/code/modules/admin/verbs/striketeam_syndicate.dm +++ b/code/modules/admin/verbs/striketeam_syndicate.dm @@ -172,7 +172,7 @@ var/global/sent_syndicate_strike_team = 0 W.icon_state = "syndie" W.access = get_all_accesses()//They get full station access because obviously the syndicate has HAAAX, and can make special IDs for their most elite members. W.assignment = "Syndicate Commando" - W.access = get_syndicate_access(W.assignment) + W.access += get_syndicate_access(W.assignment) W.registered_name = real_name equip_to_slot_or_del(W, slot_wear_id) diff --git a/code/modules/admin/verbs/vox_raiders.dm b/code/modules/admin/verbs/vox_raiders.dm index fc6c410b770..33854109bc4 100644 --- a/code/modules/admin/verbs/vox_raiders.dm +++ b/code/modules/admin/verbs/vox_raiders.dm @@ -52,10 +52,8 @@ var/global/vox_tick = 1 equip_to_slot_or_del(new /obj/item/weapon/tank/nitrogen(src), slot_back) equip_to_slot_or_del(new /obj/item/device/flashlight(src), slot_r_store) - var/obj/item/weapon/card/id/syndicate/W = new(src) + var/obj/item/weapon/card/id/syndicate/vox/W = new(src) W.name = "[real_name]'s Legitimate Human ID Card" - W.icon_state = "id" - W.access = list(access_vox) W.assignment = "Trader" W.registered_name = real_name W.registered_user = src diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm index cf8f0204d00..a5729c0f8ac 100644 --- a/code/modules/mob/living/carbon/human/species/station.dm +++ b/code/modules/mob/living/carbon/human/species/station.dm @@ -452,6 +452,9 @@ blood_color = "#1F181F" flesh_color = "#AAAAAA" reagent_tag = PROCESS_SYN + + has_organ = list( + ) /datum/species/machine/handle_death(var/mob/living/carbon/human/H) H.emote("deathgasp") diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index e0b987a60ba..f7db0be92ab 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -213,6 +213,7 @@ var/global/list/damage_icon_parts = list() if(O.damage_state == "00") continue var/icon/DI var/cache_index = "[O.damage_state]/[O.icon_name]/[species.blood_color]/[species.name]" + if(damage_icon_parts[cache_index] == null) DI = new /icon(species.damage_overlays, O.damage_state) // the damage icon for whole human DI.Blend(new /icon(species.damage_mask, O.icon_name), ICON_MULTIPLY) // mask with this organ's pixels diff --git a/code/modules/mob/living/simple_animal/revenant/revenant.dm b/code/modules/mob/living/simple_animal/revenant/revenant.dm index 659a38fda51..bad520aa326 100644 --- a/code/modules/mob/living/simple_animal/revenant/revenant.dm +++ b/code/modules/mob/living/simple_animal/revenant/revenant.dm @@ -216,7 +216,7 @@ ..() /datum/objective/revenant/check_completion() - if(!istype(owner.current, /mob/living/simple_animal/revenant) || !owner.current) + if(!owner || !istype(owner.current, /mob/living/simple_animal/revenant)) return 0 var/mob/living/simple_animal/revenant/R = owner.current if(!R || R.stat == DEAD) diff --git a/code/modules/nano/interaction/base.dm b/code/modules/nano/interaction/base.dm index 401a82cb919..85ac56eeedc 100644 --- a/code/modules/nano/interaction/base.dm +++ b/code/modules/nano/interaction/base.dm @@ -27,7 +27,7 @@ /mob/living/silicon/robot/shared_nano_interaction() . = STATUS_INTERACTIVE - if(cell.charge <= 0) + if(!cell || cell.charge <= 0) return STATUS_CLOSE if(lockcharge) . = STATUS_DISABLED diff --git a/code/modules/nano/nanomanager.dm b/code/modules/nano/nanomanager.dm index bb73178e94a..fcd2152f561 100644 --- a/code/modules/nano/nanomanager.dm +++ b/code/modules/nano/nanomanager.dm @@ -104,6 +104,26 @@ update_count++ return update_count + /** + * Close all /nanoui uis attached to src_object + * + * @param src_object /obj|/mob The obj or mob which the uis are attached to + * + * @return int The number of uis close + */ +/datum/nanomanager/proc/close_uis(src_object) + var/src_object_key = "\ref[src_object]" + if (isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list)) + return 0 + + var/close_count = 0 + for (var/ui_key in open_uis[src_object_key]) + for (var/datum/nanoui/ui in open_uis[src_object_key][ui_key]) + if(ui && ui.src_object && ui.user && ui.src_object.nano_host()) + ui.close() + close_count++ + return close_count + /** * Update /nanoui uis belonging to user * diff --git a/code/modules/reagents/newchem/newchem_procs.dm b/code/modules/reagents/newchem/newchem_procs.dm index edeed358cf0..5c87c0f0044 100644 --- a/code/modules/reagents/newchem/newchem_procs.dm +++ b/code/modules/reagents/newchem/newchem_procs.dm @@ -17,6 +17,8 @@ datum/reagents/proc/metabolize(var/mob/M) handle_reactions() for(var/A in reagent_list) var/datum/reagent/R = A + if(!istype(R)) + continue if(ishuman(M)) var/mob/living/carbon/human/H = M //Check if this mob's species is set and can process this type of reagent diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 73dd13a1d58..d77edbb6903 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -37,7 +37,7 @@ return /obj/item/weapon/reagent_containers/food/snacks/attack(mob/M as mob, mob/user as mob, def_zone) - if(!reagents.total_volume) //Shouldn't be needed but it checks to see if it has anything left in it. + if(reagents && !reagents.total_volume) //Shouldn't be needed but it checks to see if it has anything left in it. user << "\red None of [src] left, oh no!" M.unEquip(src) //so icons update :[ qdel(src) diff --git a/icons/mob/human_races/r_slime.dmi b/icons/mob/human_races/r_slime.dmi index b79a50f7fda..5b30997c6a6 100644 Binary files a/icons/mob/human_races/r_slime.dmi and b/icons/mob/human_races/r_slime.dmi differ