From 116f532169bae4b2f6bc4587221b1a1ca183c30a Mon Sep 17 00:00:00 2001 From: Rykka_Stormheart Date: Sun, 25 Aug 2019 00:15:33 -0600 Subject: [PATCH 1/5] Several mice tweaks, mainly: Uncommented out the mice pull_size and mob_pull - this fixes mice pulling lockers and shit. Reduced mouse spawn time by half, since mice are nerfed now to not be able to pull large shit. (As they shouldn't be able to.) Merged/incorporated file from https://github.com/VOREStation/VOREStation/pull/5709 - his was simple_animal, I moved it to simple_mob. All credits for changes in mouse_vr.dm go to them. Small Fixes: Added a little extra comment to the mice examine text. <3 Fixed the "Observe" Spawn timer - it originally said 5 minutes, fixed it to show the "actual" respawn time - 60 seconds. --- code/global.dm | 2 +- .../simple_mob/subtypes/animal/passive/mouse.dm | 6 +++--- .../simple_mob/subtypes/animal/passive/mouse_vr.dm | 13 +++++++++++++ code/modules/mob/new_player/new_player.dm | 2 +- 4 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm diff --git a/code/global.dm b/code/global.dm index a1ecb08cff5..8e565e348d6 100644 --- a/code/global.dm +++ b/code/global.dm @@ -53,7 +53,7 @@ var/list/lastsignalers = list() // Keeps last 100 signals here in format: "[src] var/list/lawchanges = list() // Stores who uploaded laws to which silicon-based lifeform, and what the law was. var/list/reg_dna = list() -var/mouse_respawn_time = 5 // Amount of time that must pass between a player dying as a mouse and repawning as a mouse. In minutes. +var/mouse_respawn_time = 2.5 // Amount of time that must pass between a player dying as a mouse and repawning as a mouse. In minutes. VOREStation Edit - Changed timer to 2.5, halved from 5. var/list/monkeystart = list() var/list/wizardstart = list() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm index 70afdaf910a..7888fe34f9f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm @@ -13,8 +13,8 @@ mob_size = MOB_MINISCULE pass_flags = PASSTABLE -// can_pull_size = ITEMSIZE_TINY -// can_pull_mobs = MOB_PULL_NONE + can_pull_size = ITEMSIZE_TINY // Vorestation Edit - Rykka - Uncommented these. Not sure why they were commented out? + can_pull_mobs = MOB_PULL_NONE // Vorestation Edit - Rykka - Uncommented these. Not sure why they were commented out? layer = MOB_LAYER density = 0 @@ -52,7 +52,7 @@ icon_living = "mouse_[body_color]" icon_dead = "mouse_[body_color]_dead" icon_rest = "mouse_[body_color]_sleep" - desc = "A small [body_color] rodent, often seen hiding in maintenance areas and making a nuisance of itself." + desc = "A small [body_color] rodent, often seen hiding in maintenance areas and making a nuisance of itself. And stealing cheese, or annoying the chef. SQUEAK." /mob/living/simple_mob/animal/passive/mouse/Crossed(AM as mob|obj) if( ishuman(AM) ) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm new file mode 100644 index 00000000000..1f41f07870f --- /dev/null +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm @@ -0,0 +1,13 @@ +/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" + +/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("[U] [M.response_help] \the [M].") \ No newline at end of file diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 441ee77234f..749a88dba6a 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -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 From 12ec96d9c2769fc02bd0ed2edc76a7519d2f1e0b Mon Sep 17 00:00:00 2001 From: Rykka_Stormheart Date: Sun, 25 Aug 2019 11:31:58 -0600 Subject: [PATCH 2/5] Corrected edits to apply to _vr.dm files rather than source/master files where possible. Apologies for the possibly-sloppy edit to global_vr.dm Date: Sun, 25 Aug 2019 17:51:21 -0600 Subject: [PATCH 3/5] Final Update to global.dm - reverts back to previous update and sets mouse spawn timer to 2.5 minutes without multiple/messy edits. --- code/global.dm | 2 +- code/global_vr.dm | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/code/global.dm b/code/global.dm index a1ecb08cff5..e9bcbb49f49 100644 --- a/code/global.dm +++ b/code/global.dm @@ -53,7 +53,7 @@ var/list/lastsignalers = list() // Keeps last 100 signals here in format: "[src] var/list/lawchanges = list() // Stores who uploaded laws to which silicon-based lifeform, and what the law was. var/list/reg_dna = list() -var/mouse_respawn_time = 5 // Amount of time that must pass between a player dying as a mouse and repawning as a mouse. In minutes. +var/mouse_respawn_time = 2.5 // Amount of time that must pass between a player dying as a mouse and repawning as a mouse. In minutes. Vorestation Edit - Changed to 2.5 minutes, half of 5, in accordance with mouse nerfs and realignment. var/list/monkeystart = list() var/list/wizardstart = list() diff --git a/code/global_vr.dm b/code/global_vr.dm index 3b5171cdacf..cfa9186b1d2 100644 --- a/code/global_vr.dm +++ b/code/global_vr.dm @@ -35,6 +35,4 @@ var/global/list/acceptable_fruit_types= list( "tomato", "watermelon", "wheat", - "whitebeet") - -mouse_respawn_time = 2.5 // Amount of time that must pass between a player dying as a mouse and repawning as a mouse. In minutes. VOREStation Edit - Changed timer to 2.5, halved from 5. \ No newline at end of file + "whitebeet") \ No newline at end of file From c9f1bc43c3e893d82a874330ed5b48e60877b2ec Mon Sep 17 00:00:00 2001 From: Rykka_Stormheart Date: Mon, 26 Aug 2019 12:27:53 -0600 Subject: [PATCH 4/5] I think I did this right? I'M SO CONFUSED. --- .../mob/living/simple_mob/subtypes/animal/passive/mouse.dm | 6 +++--- vorestation.dme | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm index 0c5d79e2642..e1cb92ada30 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm @@ -13,8 +13,8 @@ mob_size = MOB_MINISCULE pass_flags = PASSTABLE - // can_pull_size = ITEMSIZE_TINY - // can_pull_mobs = MOB_PULL_NONE +// can_pull_size = ITEMSIZE_TINY +// can_pull_mobs = MOB_PULL_NONE layer = MOB_LAYER density = 0 @@ -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") \ No newline at end of file + emote_see = list("runs in a circle", "shakes", "scritches at something") diff --git a/vorestation.dme b/vorestation.dme index e68f4c096ae..8c846430009 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2384,6 +2384,7 @@ #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\lizard.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\misc.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\mouse.dm" +#include "code\modules\mob\living\simple_mob\subtypes\animal\passive\mouse_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\passive.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\penguin.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\pets\bird.dm" From c8a2fbb0660d3e6279ddf58b6852c0d0f8ec5544 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Mon, 26 Aug 2019 16:09:05 -0400 Subject: [PATCH 5/5] Update mouse_vr.dm --- .../mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm index 164d889a366..4b4cdcade4a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm @@ -5,7 +5,7 @@ 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 [body_color] rodent, often seen hiding in maintenance areas and making a nuisance of itself. And stealing cheese, or annoying the chef. SQUEAK! <3" + 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 @@ -15,4 +15,4 @@ 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("[U] [M.response_help] \the [M].") \ No newline at end of file + U.visible_message("[U] [M.response_help] \the [M].")