cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 03:27:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5711 from Rykka-Stormheart/Shep-dev-branch

Browse Source 
Mouse Tweaks, and fixes - Blame Polaris. <3
This commit is contained in:
Novacat
2019-08-31 01:38:43 -04:00
committed by GitHub
parent 1f547beef5 c94d5271d2
commit cffaa2c9e4
5 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm
+1 -1
View File
@@ -112,4 +112,4 @@
/datum/say_list/mouse
speak = list("Squeek!","SQUEEK!","Squeek?")
emote_hear = list("squeeks","squeaks","squiks")
emote_see = list("runs in a circle", "shakes", "scritches at something")
emote_see = list("runs in a circle", "shakes", "scritches at something")
code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm
+18
View File
@@ -0,0 +1,18 @@
/mob/living/simple_mob/animal/passive/mouse
no_vore = 1 //Mice can't eat others due to the amount of bugs caused by it.
vore_taste = "cheese"
can_pull_size = ITEMSIZE_TINY // Rykka - Uncommented these. Not sure why they were commented out in the original Polaris files, maybe a mob rework mistake?
can_pull_mobs = MOB_PULL_NONE // Rykka - Uncommented these. Not sure why they were commented out in the original Polaris files, maybe a mob rework mistake?
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"
/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
/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
U.setClickCooldown(U.get_attack_speed()) //if there's a cleaner way in baycode, I'll change this
U.visible_message("<span class='notice'>[U] [M.response_help] \the [M].</span>")
code/modules/mob/new_player/new_player.dm
+1 -1
View File
@@ -114,7 +114,7 @@
if(href_list["observe"])
if(alert(src,"Are you sure you wish to observe? You will have to wait 5 minute before being able to respawn!","Player Setup","Yes","No") == "Yes") //Vorestation edit
if(alert(src,"Are you sure you wish to observe? You will have to wait 60 seconds before being able to respawn!","Player Setup","Yes","No") == "Yes") //Vorestation edit - Rykka corrected to 60 seconds to match current spawn time
if(!client) return 1
//Make a new mannequin quickly, and allow the observer to take the appearance