diff --git a/code/game/objects/storage/kit.dm b/code/game/objects/storage/kit.dm index 02cb92d93e4..b0fdf148a76 100644 --- a/code/game/objects/storage/kit.dm +++ b/code/game/objects/storage/kit.dm @@ -140,6 +140,17 @@ ..() return +/obj/item/weapon/storage/seccart_kit/New() + new /obj/item/weapon/cartridge/security(src) + new /obj/item/weapon/cartridge/security(src) + new /obj/item/weapon/cartridge/security(src) + new /obj/item/weapon/cartridge/security(src) + new /obj/item/weapon/cartridge/security(src) + new /obj/item/weapon/cartridge/security(src) + new /obj/item/weapon/cartridge/security(src) + ..() + return + /obj/item/weapon/storage/donkpocket_kit/New() new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src) diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index d74b831f510..28cde78ffcf 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -99,7 +99,6 @@ proc/move_mining_shuttle() /obj/item/device/flashlight/lantern name = "Mining Lantern" - icon = 'lighting.dmi' icon_state = "lantern-off" desc = "A miner's lantern" anchored = 0 diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 1edb89bbaf2..169b75719ce 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -148,7 +148,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp /mob/dead/observer/proc/dead_tele() set category = "Ghost" set name = "Teleport" - set desc= "Teleport" + set desc= "Teleport to a location" if((usr.stat != 2) || !istype(usr, /mob/dead/observer)) usr << "Not when you're not dead!" return @@ -164,6 +164,33 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp L+=T usr.loc = pick(L) +/mob/dead/observer/verb/jumptomob() //Moves the ghost instead of just changing the ghosts's eye -Nodrak + set category = "Ghost" + set name = "Jump to Mob" + set desc = "Teleport to a mob" + + if(istype(usr, /mob/dead/observer)) //Make sure they're an observer! + + + var/list/dest = list() //List of possible destinations (mobs) + var/target = null //Chosen target. + + dest += getmobs() //Fill list, prompt user with list + target = input("Please, select a player!", "Jump to Mob", null, null) as null|anything in dest + + if (!target)//Make sure we actually have a target + return + else + var/mob/M = dest[target] //Destination mob + var/mob/A = src //Source mob + var/turf/T = get_turf(M) //Turf of the destination mob + + if(T && isturf(T)) //Make sure the turf exists, then move the source to that destination. + A.loc = T + else + A << "This mob is not located in the game world." + + /mob/dead/observer/verb/toggle_alien_candidate() set name = "Toggle Be Alien Candidate" set category = "Ghost" diff --git a/code/modules/mob/living/carbon/alien/humanoid/life.dm b/code/modules/mob/living/carbon/alien/humanoid/life.dm index e843086d29f..a0ca95b0413 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/life.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm @@ -565,15 +565,6 @@ D.cure() return - check_if_buckled() - if (src.buckled) - src.lying = (istype(src.buckled, /obj/structure/stool/bed) ? 1 : 0) - if(src.lying) - src.drop_item() - src.density = 1 - else - src.density = !src.lying - handle_stomach() spawn(0) for(var/mob/M in stomach_contents) diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm index 68708360cfa..ae61bbfa032 100644 --- a/code/modules/mob/living/carbon/alien/larva/life.dm +++ b/code/modules/mob/living/carbon/alien/larva/life.dm @@ -494,15 +494,6 @@ D.cure() return - check_if_buckled() - if (buckled) - lying = (istype(buckled, /obj/structure/stool/bed) ? 1 : 0) - if(lying) - drop_item() - density = 1 - else - density = !lying - handle_stomach() spawn(0) for(var/mob/M in stomach_contents) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index b681d2f3aad..923a005342f 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1361,21 +1361,6 @@ return - - check_if_buckled() - if(buckle_check != (buckled ? 1 : 0)) - buckle_check = (buckled ? 1 : 0) - if (buckled) - lying = istype(buckled, /obj/structure/stool/bed) || istype(buckled, /obj/machinery/conveyor) - if(lying) - drop_item() - density = 1 - else - density = !lying - if(buckle_check) - if(istype(buckled, /obj/structure/stool/bed) || istype(buckled, /obj/machinery/conveyor)) - drop_item() - handle_stomach() spawn(0) for(var/mob/M in stomach_contents) diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index 7fc7c7f34d4..f5780ed9c83 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -661,16 +661,6 @@ else virus2.activate(src) - - check_if_buckled() - if (src.buckled) - src.lying = istype(src.buckled, /obj/structure/stool/bed) || istype(src.buckled, /obj/machinery/conveyor) - if(src.lying) - src.drop_item() - src.density = 1 - else - src.density = !src.lying - handle_changeling() if (mind) if (mind.special_role == "Changeling" && changeling) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index bb992f87055..28b98787c1d 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -210,7 +210,22 @@ return /mob/living/proc/UpdateDamageIcon() - return + return + +/mob/living/proc/check_if_buckled() + if (buckled) + if(buckled == /obj/structure/stool/bed || istype(buckled, /obj/machinery/conveyor)) + lying = 1 + if(lying) + var/h = hand + hand = 0 + drop_item() + hand = 1 + drop_item() + hand = h + density = 1 + else + density = !lying /mob/living/attack_animal(mob/M) attack_paw(M) // treat it like a normal non-human attack diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 6ed478a73ec..6c42dad2eb9 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -801,7 +801,7 @@ /mob/proc/can_use_hands() if(handcuffed) return 0 - if(buckled && istype(buckled, /obj/structure/stool/bed)) // buckling does not restrict hands + if(buckled && ! istype(buckled, /obj/structure/stool/bed/chair)) // buckling does not restrict hands return 0 return ..()