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

mouse

Browse Source
This commit is contained in:
Mithrandalf
2020-01-08 15:32:07 +00:00
parent 6f24070dbd
commit 1e8a54b736
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/language/monkey.dm
View File

@@ -61,7 +61,7 @@
exclaim_verb = "squeaks"
key = "m"
flags = RESTRICTED
machine_understands = 0
machine_understands = 1 //interns got to testing the tech on lab rats
space_chance = 100
syllables = list("squeak") // , "gripes", "oi", "meow")

7
code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm
View File

@@ -10,16 +10,17 @@
desc = "A small rodent, often seen hiding in maintenance areas and making a nuisance of itself. And stealing cheese, or annoying the chef. SQUEAK! <3"
size_multiplier = 0.25
movement_cooldown = 1 //roughly half the speed of a person
movement_cooldown = 1.5 //roughly half the speed of a person
universal_understand = 1
/mob/living/simple_mob/animal/passive/mouse/attack_hand(mob/living/L)
if(L.a_intent == I_HELP) //if lime intent
if(L.a_intent == I_HELP && !istype(loc, /obj/item/weapon/holder)) //if lime intent and not in a holder already
if(!src.attempt_to_scoop(L)) //the superior way to handle scooping, checks size
..() //mouse too big to grab? pet the large mouse instead
else
..()
//No longer in use, as mice create a holder/micro object instead
/obj/item/weapon/holder/mouse/attack_self(var/mob/U)
for(var/mob/living/simple_mob/M in src.contents)
if((I_HELP) && U.canClick()) //a little snowflakey, but makes it use the same cooldown as interacting with non-inventory objects
@@ -27,7 +28,7 @@
U.visible_message("<span class='notice'>[U] [M.response_help] \the [M].</span>")
/mob/living/simple_mob/animal/passive/mouse/MouseDrop(var/obj/O) //this proc would be very easy to apply to all mobs with holders
/mob/living/simple_mob/animal/passive/mouse/MouseDrop(var/obj/O) //this proc would be very easy to apply to all mobs, holders generate dynamically
if(!(usr == src || O))
return ..()
if(istype(O, /mob/living) && O.Adjacent(src)) //controls scooping by mobs

17
code/modules/vore/resizing/holder_micro_vr.dm
View File

@@ -23,9 +23,20 @@
for(var/mob/living/carbon/human/O in contents)
O.show_inv(usr)
/obj/item/weapon/holder/micro/attack_self(var/mob/living/user)
for(var/mob/living/carbon/human/M in contents)
M.help_shake_act(user)
/obj/item/weapon/holder/micro/attack_self(mob/living/carbon/user) //reworked so it works w/ nonhumans
for(var/L in contents)
if(!isliving(L))
continue
if(ishuman(L) && user.canClick())
var/mob/living/carbon/human/H = L
H.help_shake_act(user)
user.setClickCooldown(user.get_attack_speed()) //uses the same cooldown as regular attack_hand
return
if(istype(L, /mob/living/simple_mob) && user.canClick())
var/mob/living/simple_mob/S = L
user.visible_message("<span class='notice'>[user] [S.response_help] \the [S].</span>")
user.setClickCooldown(user.get_attack_speed())
/obj/item/weapon/holder/micro/update_state()
if(istype(loc,/turf) || !(held_mob) || !(held_mob.loc == src))