mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-29 16:18:01 +01:00
Further sting improvements
Now to sting someone with active sting you alt+click them In usual mode active sting do nothing Clicking sting icon will deactivate the sting(hasnt removed the verb however) Now all monkifying will grant the monkeys what they can wear from their previous form Now all humanizing autoequips things from under you (Done by Gia's suggestion, the quality is meh) One more little change in icons
This commit is contained in:
@@ -2,6 +2,10 @@
|
||||
if (monkeyizing)
|
||||
return
|
||||
//Handle items on mob
|
||||
var/obj/item/rHand = r_hand
|
||||
var/obj/item/lHand = l_hand
|
||||
var/obj/item/Mask = wear_mask
|
||||
var/obj/item/Back = back
|
||||
|
||||
//first implants
|
||||
var/list/implants = list()
|
||||
@@ -9,11 +13,21 @@
|
||||
for(var/obj/item/weapon/implant/W in src)
|
||||
implants += W
|
||||
|
||||
//now the rest
|
||||
if (tr_flags & TR_KEEPITEMS)
|
||||
if(tr_flags & TR_KEEPITEMS)
|
||||
for(var/obj/item/W in (src.contents-implants))
|
||||
drop_from_inventory(W)
|
||||
|
||||
if(tr_flags & TR_KEEPITEMS)
|
||||
if(rHand)
|
||||
rHand.loc = src
|
||||
if(lHand)
|
||||
lHand.loc = src
|
||||
if(Back)
|
||||
Back.loc = src
|
||||
if(Mask)
|
||||
Mask.loc = src
|
||||
|
||||
|
||||
//Make mob invisible and spawn animation
|
||||
regenerate_icons()
|
||||
monkeyizing = 1
|
||||
@@ -29,8 +43,19 @@
|
||||
sleep(22)
|
||||
//animation = null
|
||||
var/mob/living/carbon/monkey/O = new /mob/living/carbon/monkey( loc )
|
||||
if(tr_flags & TR_KEEPITEMS)
|
||||
if(rHand)
|
||||
O.equip_to_slot(rHand, slot_r_hand)
|
||||
if(lHand)
|
||||
O.equip_to_slot(lHand, slot_l_hand)
|
||||
if(Mask)
|
||||
O.equip_to_slot(Mask, slot_wear_mask)
|
||||
if(Back)
|
||||
O.equip_to_slot(Back, slot_back)
|
||||
del(animation)
|
||||
|
||||
|
||||
|
||||
// hash the original name?
|
||||
if (tr_flags & TR_HASHNAME)
|
||||
O.name = "monkey ([copytext(md5(real_name), 2, 6)])"
|
||||
@@ -123,6 +148,8 @@
|
||||
flick("monkey2h", animation)
|
||||
sleep(22)
|
||||
var/mob/living/carbon/human/O = new( loc )
|
||||
for(var/obj/item/C in O.loc)
|
||||
O.equip_to_appropriate_slot(C)
|
||||
del(animation)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user