From 28c2ee46d3156546e23413f2faf3937061f89cfe Mon Sep 17 00:00:00 2001 From: Chompstation Bot Date: Wed, 7 Jul 2021 21:08:45 +0000 Subject: [PATCH 1/2] Adds a weretiger. --- code/datums/supplypacks/science_vr.dm | 7 +++ .../crates_lockers/largecrate_vr.dm | 8 +++- .../objects/structures/ghost_pods/event_vr.dm | 7 +++ .../simple_mob/subtypes/vore/weretiger.dm | 40 ++++++++++++++++++ icons/mob/bigcat.dmi | Bin 0 -> 8668 bytes vorestation.dme | 1 + 6 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 code/modules/mob/living/simple_mob/subtypes/vore/weretiger.dm create mode 100644 icons/mob/bigcat.dmi diff --git a/code/datums/supplypacks/science_vr.dm b/code/datums/supplypacks/science_vr.dm index e0e4ea2e68..1d9922e7d8 100644 --- a/code/datums/supplypacks/science_vr.dm +++ b/code/datums/supplypacks/science_vr.dm @@ -22,6 +22,13 @@ containername = "EXTREMELY Dangerous Predator crate" access = access_xenobiology contraband = 1 + +/datum/supply_pack/sci/weretiger + name = "Exotic Weretiger crate" + cost = 55 + containertype = /obj/structure/largecrate/animal/weretiger + containername = "Weretiger crate" + access = access_xenobiology /* /datum/supply_pack/sci/otie name = "VARMAcorp adoptable reject (Dangerous!)" diff --git a/code/game/objects/structures/crates_lockers/largecrate_vr.dm b/code/game/objects/structures/crates_lockers/largecrate_vr.dm index c8c98311eb..b70833ccea 100644 --- a/code/game/objects/structures/crates_lockers/largecrate_vr.dm +++ b/code/game/objects/structures/crates_lockers/largecrate_vr.dm @@ -55,6 +55,7 @@ /mob/living/simple_mob/vore/aggressive/rat/tame, /mob/living/simple_mob/otie/zorgoia, //CHOMPstation edit /mob/living/simple_mob/vore/rabbit, + /mob/living/simple_mob/vore/weretiger;0.5, // /mob/living/simple_mob/otie;0.5 )) return ..() @@ -139,4 +140,9 @@ /obj/structure/largecrate/animal/jerboa name = "Jerboa Crate" desc = "Lots, and lots of squeaking." - starts_with = list(/mob/living/simple_mob/animal/passive/mouse/jerboa) \ No newline at end of file + starts_with = list(/mob/living/simple_mob/animal/passive/mouse/jerboa) + +/obj/structure/largecrate/animal/weretiger + name = "Weretiger Crate" + desc = "You can hear a lot of annoyed scratches, clearly someone doesn't enjoy being locked up." + starts_with = list(/mob/living/simple_mob/vore/weretiger) \ No newline at end of file diff --git a/code/game/objects/structures/ghost_pods/event_vr.dm b/code/game/objects/structures/ghost_pods/event_vr.dm index 148ed3ff4d..db943999dc 100644 --- a/code/game/objects/structures/ghost_pods/event_vr.dm +++ b/code/game/objects/structures/ghost_pods/event_vr.dm @@ -52,8 +52,15 @@ "Webslinger Giant Spider" = /mob/living/simple_mob/animal/giant_spider/webslinger, "Frost Giant Spider" = /mob/living/simple_mob/animal/giant_spider/frost, "Nurse Giant Spider" = /mob/living/simple_mob/animal/giant_spider/nurse/eggless, +<<<<<<< HEAD "Giant Spider Queen" = /mob/living/simple_mob/animal/giant_spider/nurse/queen/eggless, "Lesser Large Dragon" = /mob/living/simple_mob/vore/bigdragon/friendly/maintpred //CHOMPStation add. +||||||| parent of 37a522e7bf... Merge pull request #10948 from Ketrai/bigtig + "Giant Spider Queen" = /mob/living/simple_mob/animal/giant_spider/nurse/queen/eggless +======= + "Giant Spider Queen" = /mob/living/simple_mob/animal/giant_spider/nurse/queen/eggless, + "Weretiger" = /mob/living/simple_mob/vore/weretiger +>>>>>>> 37a522e7bf... Merge pull request #10948 from Ketrai/bigtig ) /obj/structure/ghost_pod/ghost_activated/maintpred/create_occupant(var/mob/M) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/weretiger.dm b/code/modules/mob/living/simple_mob/subtypes/vore/weretiger.dm new file mode 100644 index 0000000000..0df61d7277 --- /dev/null +++ b/code/modules/mob/living/simple_mob/subtypes/vore/weretiger.dm @@ -0,0 +1,40 @@ +/mob/living/simple_mob/vore/weretiger + name = "weretiger" + desc = "A big scary, albino were-tiger! At least they seem decently mannered..." + tt_desc = "Tigris Thropus Album" + + icon_state = "bigcat" + icon_living = "bigcat" + icon_dead = "bigcat_dead" + icon_rest = null + icon = 'icons/mob/bigcat.dmi' + + faction = "panther" + maxHealth = 150 + health = 150 + + response_help = "pats" + response_disarm = "gently pushes aside" + response_harm = "hits" + + harm_intent_damage = 15 + melee_damage_lower = 10 + melee_damage_upper = 20 + attacktext = list("mauled") + + say_list_type = /datum/say_list/weretiger + ai_holder_type = /datum/ai_holder/simple_mob/retaliate + +// Nomnomn +/mob/living/simple_mob/vore/weretiger + vore_active = 1 + vore_bump_chance = 10 + vore_bump_emote = "sneaks up on" + vore_pounce_chance = 50 + vore_default_mode = DM_HOLD + vore_icons = SA_ICON_LIVING + +/datum/say_list/weretiger + speak = list("Gruff.","ROAR!","Growl.") + emote_hear = list("growls!","grunts.") + emote_see = list("pads around noisily.","scratches the floor thoroughly.") \ No newline at end of file diff --git a/icons/mob/bigcat.dmi b/icons/mob/bigcat.dmi new file mode 100644 index 0000000000000000000000000000000000000000..175c07d362c86d1fa27a43d7486c7e4714844cf6 GIT binary patch literal 8668 zcmZvCc|26_`}a(iu@hyD(PrNXg$9viUqW`JB1@FDVP+6QQi#f~A|y+8#t?;M%Nj9c zjTnP5i&>uI^ZWju&-47A=Z|@vbHC4ZU9bDx_jSFm_c?QttSwErIYc=?AP~3d6(d^^ z2;2euP;5+x$QwgN;Gk=5Zg1St(V=q6aC&N9Mp`4|S!cqHLI#7;P&F!}bXhI9NmNwS z7Q1$_eBl^GtPzn9I89Hr?XUKaw`~EA3|Sc%0D(hnE$u-1D^s_DLDoZirx2rC4{qM~ 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 YzrGikF{H;0%oSv6Y-#k-&@=Xb0b-8-mjD0& literal 0 HcmV?d00001 diff --git a/vorestation.dme b/vorestation.dme index 549afff7ec..746add7e66 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -3275,6 +3275,7 @@ #include "code\modules\mob\living\simple_mob\subtypes\vore\solargrub_larva.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\solarmoth_ch.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\vore.dm" +#include "code\modules\mob\living\simple_mob\subtypes\vore\weretiger.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\wolf.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\wolfgirl.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\xeno_vore.dm" From 70fcf3898766eb0c071c95a40b96a6976fef65e8 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Wed, 7 Jul 2021 23:58:56 -0400 Subject: [PATCH 2/2] powder that makes you say yes --- code/game/objects/structures/ghost_pods/event_vr.dm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/code/game/objects/structures/ghost_pods/event_vr.dm b/code/game/objects/structures/ghost_pods/event_vr.dm index db943999dc..eeca54e11c 100644 --- a/code/game/objects/structures/ghost_pods/event_vr.dm +++ b/code/game/objects/structures/ghost_pods/event_vr.dm @@ -52,15 +52,9 @@ "Webslinger Giant Spider" = /mob/living/simple_mob/animal/giant_spider/webslinger, "Frost Giant Spider" = /mob/living/simple_mob/animal/giant_spider/frost, "Nurse Giant Spider" = /mob/living/simple_mob/animal/giant_spider/nurse/eggless, -<<<<<<< HEAD "Giant Spider Queen" = /mob/living/simple_mob/animal/giant_spider/nurse/queen/eggless, + "Weretiger" = /mob/living/simple_mob/vore/weretiger, "Lesser Large Dragon" = /mob/living/simple_mob/vore/bigdragon/friendly/maintpred //CHOMPStation add. -||||||| parent of 37a522e7bf... Merge pull request #10948 from Ketrai/bigtig - "Giant Spider Queen" = /mob/living/simple_mob/animal/giant_spider/nurse/queen/eggless -======= - "Giant Spider Queen" = /mob/living/simple_mob/animal/giant_spider/nurse/queen/eggless, - "Weretiger" = /mob/living/simple_mob/vore/weretiger ->>>>>>> 37a522e7bf... Merge pull request #10948 from Ketrai/bigtig ) /obj/structure/ghost_pod/ghost_activated/maintpred/create_occupant(var/mob/M)