Merge pull request #5931 from Heroman3003/holderfix

Fixes holder bugs
This commit is contained in:
Novacat
2019-09-21 17:15:56 -04:00
committed by GitHub
6 changed files with 13 additions and 2 deletions
@@ -0,0 +1,2 @@
/mob/living/silicon/robot/drone
mob_size = MOB_SMALL
@@ -12,6 +12,8 @@
/mob/living/simple_mob/animal/passive/mouse/attack_hand(mob/living/hander)
if(hander.a_intent == I_HELP) //if lime intent
get_scooped(hander) //get scooped
else
..()
/obj/item/weapon/holder/mouse/attack_self(var/mob/U)
for(var/mob/living/simple_mob/M in src.contents)
@@ -4,6 +4,7 @@
name = "micro"
desc = "Another crewmember, small enough to fit in your hand."
icon_state = "micro"
icon_override = 'icons/mob/head_vr.dmi'
slot_flags = SLOT_FEET | SLOT_HEAD | SLOT_ID
w_class = ITEMSIZE_SMALL
item_icons = list() // No in-hand sprites (for now, anyway, we could totally add some)
@@ -34,4 +35,9 @@
var/turf/here = get_turf(src)
for(var/atom/movable/A in src)
A.forceMove(here)
return ..()
return ..()
/obj/item/weapon/holder/micro/sync(var/mob/living/M)
..()
for(var/mob/living/carbon/human/I in contents)
item_state = lowertext(I.species.name)
+1 -1
View File
@@ -135,7 +135,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
var/mob/living/simple_mob/SA = M
if(!SA.has_hands)
return 0
if(M.buckled)
if(buckled)
to_chat(usr,"<span class='notice'>You have to unbuckle \the [M] before you pick them up.</span>")
return 0
if(size_diff >= 0.50)
Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 16 KiB

+1
View File
@@ -2361,6 +2361,7 @@
#include "code\modules\mob\living\silicon\robot\drone\drone_items.dm"
#include "code\modules\mob\living\silicon\robot\drone\drone_manufacturer.dm"
#include "code\modules\mob\living\silicon\robot\drone\drone_say.dm"
#include "code\modules\mob\living\silicon\robot\drone\drone_vr.dm"
#include "code\modules\mob\living\silicon\robot\robot_modules\event.dm"
#include "code\modules\mob\living\silicon\robot\robot_modules\event_vr.dm"
#include "code\modules\mob\living\silicon\robot\robot_modules\station.dm"