diff --git a/code/_onclick/hud/ai.dm b/code/_onclick/hud/ai.dm index 44c2a762bb..37d9616ea5 100644 --- a/code/_onclick/hud/ai.dm +++ b/code/_onclick/hud/ai.dm @@ -40,9 +40,9 @@ using.layer = SCREEN_LAYER adding += using -//Crew Monitorting +//Crew Monitoring using = new /obj/screen() - using.name = "Crew Monitorting" + using.name = "Crew Monitoring" using.icon = 'icons/mob/screen_ai.dmi' using.icon_state = "crew_monitor" using.screen_loc = ui_ai_crew_monitor diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index cbb49166c0..522db6e1c4 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -420,7 +420,7 @@ var/mob/living/silicon/ai/AI = usr AI.toggle_camera_light() - if("Crew Monitorting") + if("Crew Monitoring") if(isAI(usr)) var/mob/living/silicon/ai/AI = usr AI.subsystem_crew_monitor() diff --git a/code/game/machinery/computer/guestpass.dm b/code/game/machinery/computer/guestpass.dm index f0b763ed99..a50680ef8d 100644 --- a/code/game/machinery/computer/guestpass.dm +++ b/code/game/machinery/computer/guestpass.dm @@ -25,6 +25,8 @@ user << "It expired at [worldtime2text(expiration_time)]." /obj/item/weapon/card/id/guest/read() + if(!Adjacent(usr)) + return //Too far to read if (world.time > expiration_time) usr << "This pass expired at [worldtime2text(expiration_time)]." else diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index f336ad310e..e1c65243d9 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -232,7 +232,6 @@ /obj/item/weapon/hand_tele, /obj/item/weapon/card/id/captains_spare, /obj/item/device/aicard, - /obj/item/device/mmi, /obj/item/device/paicard, /obj/item/weapon/gun, /obj/item/weapon/pinpointer, diff --git a/code/game/objects/items/weapons/storage/misc.dm b/code/game/objects/items/weapons/storage/misc.dm index 8d954d5306..cf1af1ea79 100644 --- a/code/game/objects/items/weapons/storage/misc.dm +++ b/code/game/objects/items/weapons/storage/misc.dm @@ -16,6 +16,7 @@ icon_state = "donutbox" name = "donut box" var/startswith = 6 + max_storage_space = 12 can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/donut) foldable = /obj/item/stack/material/cardboard diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index 0f26f2d55b..ee93b2acf4 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -373,7 +373,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O var/organ_tag = input(user, "Which limb do you want to change?") as null|anything in limb_selection_list - if(!organ_tag && !CanUseTopic(user)) return TOPIC_NOACTION + if(!organ_tag || !CanUseTopic(user)) return TOPIC_NOACTION var/limb = null var/second_limb = null // if you try to change the arm, the hand should also change diff --git a/code/modules/detectivework/microscope/dnascanner.dm b/code/modules/detectivework/microscope/dnascanner.dm index b3c2874014..b4359dcb41 100644 --- a/code/modules/detectivework/microscope/dnascanner.dm +++ b/code/modules/detectivework/microscope/dnascanner.dm @@ -24,6 +24,7 @@ component_parts += new /obj/item/weapon/stock_parts/scanning_module(src) component_parts += new /obj/item/weapon/stock_parts/scanning_module(src) RefreshParts() + ..() /obj/machinery/dnaforensics/attackby(var/obj/item/W, mob/user as mob) diff --git a/code/modules/mob/death.dm b/code/modules/mob/death.dm index 906fe22521..4b6598cf1b 100644 --- a/code/modules/mob/death.dm +++ b/code/modules/mob/death.dm @@ -85,6 +85,7 @@ dead_mob_list |= src updateicon() + handle_regular_hud_updates() if(ticker && ticker.mode) ticker.mode.check_win() diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 368cad0ff7..6a45483251 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -31,8 +31,6 @@ BITSET(hud_updateflag, STATUS_HUD) BITSET(hud_updateflag, LIFE_HUD) - handle_hud_list() - //Handle species-specific deaths. species.handle_death(src) animate_tail_stop() diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index d0739f2232..9790559edf 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1557,7 +1557,7 @@ /mob/living/carbon/human/proc/handle_hud_list() if (BITTEST(hud_updateflag, HEALTH_HUD)) var/image/holder = hud_list[HEALTH_HUD] - if(stat == 2) + if(stat == DEAD) holder.icon_state = "hudhealth-100" // X_X else var/percentage_health = RoundHealth((health-config.health_threshold_crit)/(maxHealth-config.health_threshold_crit)*100) @@ -1581,7 +1581,7 @@ var/image/holder = hud_list[STATUS_HUD] var/image/holder2 = hud_list[STATUS_HUD_OOC] - if(stat == 2) + if(stat == DEAD) holder.icon_state = "huddead" holder2.icon_state = "huddead" else if(status_flags & XENO_HOST) diff --git a/code/modules/mob/living/carbon/human/stripping.dm b/code/modules/mob/living/carbon/human/stripping.dm index 26efe8ee90..19d7a799dd 100644 --- a/code/modules/mob/living/carbon/human/stripping.dm +++ b/code/modules/mob/living/carbon/human/stripping.dm @@ -13,22 +13,22 @@ // Handle things that are part of this interface but not removing/replacing a given item. if("pockets") visible_message("\The [user] is trying to empty \the [src]'s pockets!") - if(do_after(user,HUMAN_STRIP_DELAY)) + if(do_after(user,HUMAN_STRIP_DELAY,src)) empty_pockets(user) return if("splints") visible_message("\The [user] is trying to remove \the [src]'s splints!") - if(do_after(user,HUMAN_STRIP_DELAY)) + if(do_after(user,HUMAN_STRIP_DELAY,src)) remove_splints(user) return if("sensors") visible_message("\The [user] is trying to set \the [src]'s sensors!") - if(do_after(user,HUMAN_STRIP_DELAY)) + if(do_after(user,HUMAN_STRIP_DELAY,src)) toggle_sensors(user) return if("internals") visible_message("\The [usr] is trying to set \the [src]'s internals!") - if(do_after(user,HUMAN_STRIP_DELAY)) + if(do_after(user,HUMAN_STRIP_DELAY,src)) toggle_internals(user) return if("tie") @@ -40,7 +40,7 @@ return visible_message("\The [usr] is trying to remove \the [src]'s [A.name]!") - if(!do_after(user,HUMAN_STRIP_DELAY)) + if(!do_after(user,HUMAN_STRIP_DELAY,src)) return if(!A || suit.loc != src || !(A in suit.accessories)) @@ -74,7 +74,7 @@ else visible_message("\The [user] is trying to put \a [held] on \the [src]!") - if(!do_after(user,HUMAN_STRIP_DELAY)) + if(!do_after(user,HUMAN_STRIP_DELAY,src)) return if(!stripping && user.get_active_hand() != held) diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index c3162b030c..d9a8ad84b4 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -53,8 +53,7 @@ update_canmove() - if(client) - handle_regular_hud_updates() + handle_regular_hud_updates() /mob/living/proc/handle_breathing() return