Moves some files around and adds interactions to mob holders

woo
This commit is contained in:
Dahlular
2020-04-19 21:34:21 -06:00
parent 55e9c69df0
commit ffc31b6fae
7 changed files with 212 additions and 64 deletions
@@ -1103,3 +1103,5 @@
//define holder_type on nerds we wanna commit scoop to
/mob/living/carbon/human
var/holder_type = /obj/item/clothing/head/mob_holder/micro
can_be_held = "micro"
@@ -65,3 +65,5 @@
var/static/list/can_ride_typecache = typecacheof(list(/mob/living/carbon/human, /mob/living/simple_animal/slime, /mob/living/simple_animal/parrot))
var/lastpuke = 0
var/last_fire_update
can_be_held = "micro"
+1 -11
View File
@@ -73,20 +73,10 @@
L.put_in_hands(holder)
return
//shoehorned (get it?) and lazy way to do instant foot pickups cause haha funny.
/mob/living/proc/mob_pickupfeet(mob/living/L)
var/obj/item/clothing/head/mob_holder/holder = generate_mob_holder()
if(!holder)
return
drop_all_held_items()
L.equip_to_slot(holder, SLOT_SHOES)
return
/mob/living/proc/mob_try_pickup(mob/living/user)
if(!ishuman(user) || !src.Adjacent(user) || user.incapacitated() || !can_be_held)
return FALSE
if(abs(user.get_effective_size()/src.get_effective_size()) < 2.0 )
to_chat(user, "<span class='warning'>They're too big to pick up!</span>")
if(src.can_be_held == "micro")
return FALSE
if(user.get_active_held_item())
to_chat(user, "<span class='warning'>Your hands are full!</span>")
+3 -2
View File
@@ -42,6 +42,9 @@
/mob/living/proc/generate_mob_holder()
if(ishuman(src))
var/obj/item/clothing/head/mob_holder/micro/holder = new(get_turf(src), src, (istext(can_be_held) ? can_be_held : ""), 'icons/mob/animals_held.dmi', 'icons/mob/animals_held_lh.dmi', 'icons/mob/animals_held_rh.dmi')
return holder
var/obj/item/clothing/head/mob_holder/holder = new(get_turf(src), src, (istext(can_be_held) ? can_be_held : ""), 'icons/mob/animals_held.dmi', 'icons/mob/animals_held_lh.dmi', 'icons/mob/animals_held_rh.dmi')
return holder
@@ -1244,5 +1247,3 @@
/mob/living
var/size_multiplier = 1 //multiplier for the mob's icon size atm
var/previous_size = 1
var/holder_default
// can_be_held = "micro"
+1 -1
View File
@@ -108,7 +108,7 @@
var/list/obj/effect/proc_holder/abilities = list()
var/can_be_held = TRUE //whether this can be picked up and held. Currently needs to be on for sizecode to work, fix later.
var/can_be_held = FALSE
var/radiation = 0 //If the mob is irradiated.
var/ventcrawl_layer = PIPING_LAYER_DEFAULT