mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
Removes equip_e - Fixes #423
This updates everything that used equip_e, particularly the strip panel, but also DNA injectors and CPR. Removed unused mob vars: var/obj/effect/organstructure/organStructure var/other var/proc_holder_list[] Removed unused alien suit and head slots. Removed var/obj/item/weapon/card/id/wear_id from monkeys, and updated ed209s to not use : Renamed HUMAN_STRIP_DELAY to STRIP_DELAY. Muddled Topics() around so that mobs are now a bit more OO. Also updated quite a few misc inventory procs to various degrees. Updated monkey and aliens huds a little bit. Random movement when confused now happens half the time. Fixed monkey breathmask onmobs. Added a .unconscious text style, for that nice bold blue text you get when you're unconscious. Only CPR uses it at the moment. This has been tested fairly extensively, and everything seems to work fine. -Merged commits ~carnie Signed-off-by: carnie <elly1989@rocketmail.com>
This commit is contained in:
@@ -151,14 +151,23 @@
|
||||
return
|
||||
|
||||
|
||||
/mob/proc/u_equip(W as obj)
|
||||
if (W == r_hand)
|
||||
/mob/proc/u_equip(obj/item/I)
|
||||
if(!I) return 0
|
||||
|
||||
if(I == r_hand)
|
||||
r_hand = null
|
||||
update_inv_r_hand(0)
|
||||
else if (W == l_hand)
|
||||
else if(I == l_hand)
|
||||
l_hand = null
|
||||
update_inv_l_hand(0)
|
||||
return
|
||||
|
||||
if(I)
|
||||
if(client)
|
||||
client.screen -= I
|
||||
I.loc = loc
|
||||
I.dropped(src)
|
||||
if(I)
|
||||
I.layer = initial(I.layer)
|
||||
|
||||
|
||||
//Attemps to remove an object on a mob. Will not move it to another area or such, just removes from the mob.
|
||||
|
||||
Reference in New Issue
Block a user