From fc6e9e611406c89d4738ec29c0bec4e67f05b4f9 Mon Sep 17 00:00:00 2001 From: Ren Erthilo Date: Tue, 24 Apr 2012 18:58:33 +0100 Subject: [PATCH] TG: Buckling to chairs no longer causes you to drop anything. Added Nodrak's Jump to Mob verb. Added Sieve's lantern fix. Commented out the silicate recipe. Added Skaer's sec cartridge box to the armoury. Moved the check_if_buckled() proc to mob/living, rather than having it repeated. Revision: r3168 Author: petethegoat --- code/game/objects/storage/kit.dm | 11 +++++++ code/modules/mining/mine_items.dm | 1 - code/modules/mob/dead/observer/observer.dm | 29 ++++++++++++++++++- .../mob/living/carbon/alien/humanoid/life.dm | 9 ------ .../mob/living/carbon/alien/larva/life.dm | 9 ------ code/modules/mob/living/carbon/human/life.dm | 15 ---------- code/modules/mob/living/carbon/monkey/life.dm | 10 ------- code/modules/mob/living/living.dm | 17 ++++++++++- code/modules/mob/mob.dm | 2 +- 9 files changed, 56 insertions(+), 47 deletions(-) diff --git a/code/game/objects/storage/kit.dm b/code/game/objects/storage/kit.dm index 02cb92d93e..b0fdf148a7 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 d74b831f51..28cde78ffc 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 1edb89bbaf..169b75719c 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 e843086d29..a0ca95b041 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 68708360cf..ae61bbfa03 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 b681d2f3aa..923a005342 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 7fc7c7f34d..f5780ed9c8 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 bb992f8705..28b98787c1 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 6ed478a73e..6c42dad2eb 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 ..()