mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-21 06:25:59 +00:00
Removed unused code in hologram.dm
Fixes displaycase when you could put a new item in it w/o first removing the first one. Fixes parrot going through windows when getting on its perch, and some other cases of in_range() instead of Ajacent(). Fixes not being able to change transfer amount of reagent containers while buckled. Remove unused sprites in stationobjs.dmi
This commit is contained in:
@@ -181,7 +181,7 @@
|
||||
/mob/living/simple_animal/parrot/Topic(href, href_list)
|
||||
|
||||
//Can the usr physically do this?
|
||||
if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
|
||||
if(usr.incapacitated() || !usr.Adjacent(loc))
|
||||
return
|
||||
|
||||
//Is the usr's mob type able to do this? (lolaliens)
|
||||
@@ -480,7 +480,7 @@
|
||||
parrot_state = PARROT_SWOOP | PARROT_RETURN
|
||||
return
|
||||
|
||||
if(in_range(src, parrot_interest))
|
||||
if(Adjacent(parrot_interest))
|
||||
|
||||
if(isliving(parrot_interest))
|
||||
steal_from_mob()
|
||||
@@ -508,7 +508,7 @@
|
||||
parrot_state = PARROT_WANDER
|
||||
return
|
||||
|
||||
if(in_range(src, parrot_perch))
|
||||
if(Adjacent(parrot_perch))
|
||||
src.loc = parrot_perch.loc
|
||||
drop_held_item()
|
||||
parrot_state = PARROT_PERCH
|
||||
@@ -548,7 +548,7 @@
|
||||
a_intent = "harm"
|
||||
|
||||
//If the mob is close enough to interact with
|
||||
if(in_range(src, parrot_interest))
|
||||
if(Adjacent(parrot_interest))
|
||||
|
||||
//If the mob we've been chasing/attacking dies or falls into crit, check for loot!
|
||||
if(L.stat)
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
set name = "Set transfer amount"
|
||||
set category = "Object"
|
||||
set src in range(0)
|
||||
if(usr.stat || !usr.canmove || usr.restrained())
|
||||
if(usr.incapacitated())
|
||||
return
|
||||
var/N = input("Amount per transfer from this:","[src]") as null|anything in possible_transfer_amounts
|
||||
if (N)
|
||||
|
||||
Reference in New Issue
Block a user