cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-12-05 09:33:44 -05:00
committed by GitHub
parent 713b15a17c
commit 10b2c20ed3
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
code/modules/mob/holder.dm
View File

@@ -129,11 +129,30 @@ var/list/holder_mob_icon_cache = list()
item_state = held.icon_state item_state = held.icon_state
/obj/item/weapon/holder/mouse /obj/item/weapon/holder/mouse
name = "mouse"
desc = "It's a small rodent."
item_state = "mouse_gray"
slot_flags = SLOT_EARS | SLOT_HEAD | SLOT_ID
origin_tech = list(TECH_BIO = 2)
w_class = ITEMSIZE_TINY w_class = ITEMSIZE_TINY
/obj/item/weapon/holder/pai/Initialize(mapload, mob/held) /obj/item/weapon/holder/mouse/white
. = ..() item_state = "mouse_white"
item_state = held.icon_state
/obj/item/weapon/holder/mouse/gray
item_state = "mouse_gray"
/obj/item/weapon/holder/mouse/brown
item_state = "mouse_brown"
/obj/item/weapon/holder/mouse/black
item_state = "mouse_black"
/obj/item/weapon/holder/mouse/operative
item_state = "mouse_operative"
/obj/item/weapon/holder/mouse/rat
item_state = "mouse_rat"
/obj/item/weapon/holder/possum /obj/item/weapon/holder/possum
origin_tech = list(TECH_BIO = 2) origin_tech = list(TECH_BIO = 2)
@@ -268,8 +287,6 @@ var/list/holder_mob_icon_cache = list()
/mob/living/MouseDrop(var/atom/over_object) /mob/living/MouseDrop(var/atom/over_object)
var/mob/living/carbon/human/H = over_object var/mob/living/carbon/human/H = over_object
if(holder_type && issmall(src) && istype(H) && !H.lying && Adjacent(H) && (src.a_intent == I_HELP && H.a_intent == I_HELP)) //VOREStation Edit if(holder_type && issmall(src) && istype(H) && !H.lying && Adjacent(H) && (src.a_intent == I_HELP && H.a_intent == I_HELP)) //VOREStation Edit
if(istype(src, /mob/living/simple_mob/animal/passive/mouse)) //vorestation edit
return ..() //vorestation edit
if(!issmall(H) || !istype(src, /mob/living/carbon/human)) if(!issmall(H) || !istype(src, /mob/living/carbon/human))
get_scooped(H, (usr == src)) get_scooped(H, (usr == src))
return return