From 7efe6f2cad620bbc021a3b8006d5644b2c29e064 Mon Sep 17 00:00:00 2001 From: Shadowfire Date: Fri, 18 Dec 2020 17:02:15 +0100 Subject: [PATCH] Auto stash before rebase of "CHOMPStation2/master" --- code/game/objects/items/weapons/gift_wrappaper_ch.dm | 5 ++--- .../items/weapons/grenades/spawnergrenade_ch.dm | 11 ++++++++--- code/modules/projectiles/guns/launcher/confetti_ch.dm | 4 ++-- code/modules/vore/appearance/sprite_accessories_ch.dm | 9 ++++++++- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/code/game/objects/items/weapons/gift_wrappaper_ch.dm b/code/game/objects/items/weapons/gift_wrappaper_ch.dm index ebcd7bb176..d1dcbb9870 100644 --- a/code/game/objects/items/weapons/gift_wrappaper_ch.dm +++ b/code/game/objects/items/weapons/gift_wrappaper_ch.dm @@ -105,12 +105,11 @@ /obj/item/weapon/grenade/spawnergrenade/casino/otie, /obj/item/weapon/grenade/spawnergrenade/casino/otie/chubby, /obj/item/weapon/grenade/spawnergrenade/casino/zorgoia, - /obj/item/weapon/grenade/confetti) + /obj/item/weapon/lego) var/gift_type_chaos = pick( - /obj/item/weapon/lego/gib, + /obj/item/weapon/grenade/spawnergrenade/casino/gygax, /obj/item/weapon/grenade/spawnergrenade/casino/infinitycake, - /obj/item/weapon/gun/energy/meteorgun, /obj/item/weapon/grenade/spawnergrenade/casino/universal_technomancer, /obj/item/weapon/spellbook, /obj/item/weapon/book/tome/imbued) diff --git a/code/game/objects/items/weapons/grenades/spawnergrenade_ch.dm b/code/game/objects/items/weapons/grenades/spawnergrenade_ch.dm index d1c22a3b3e..17d271590c 100644 --- a/code/game/objects/items/weapons/grenades/spawnergrenade_ch.dm +++ b/code/game/objects/items/weapons/grenades/spawnergrenade_ch.dm @@ -114,8 +114,13 @@ name = "Casino Creature Container (Zorgoia)" spawner_type = /mob/living/simple_mob/otie/zorgoia/friendly +/obj/item/weapon/grenade/spawnergrenade/casino/gygax + desc = "You feel great power inside this small round sphere, with great powers comes great responsibilities!" + name = "Mysterious Grenade" + spawner_type = /obj/mecha/combat/gygax/dark + /obj/item/weapon/grenade/spawnergrenade/casino/infinitycake - desc = "Some say a cheese in his hubris made a cake to rival the gods. Sometimes it appears where it is least expected, only to vanish a few hours later.." + desc = "Some say a gouda in his hubris made a cake to rival the gods. Sometimes it appears where it is least expected, only to vanish a few hours later.." name = "Mysterious Grenade" spawner_type = null @@ -135,7 +140,7 @@ return /obj/item/weapon/grenade/spawnergrenade/casino/universal_technomancer - name = "Mysterious grenade (Tell an admin on server or discord before playing with!)" + name = "Mysterious Grenade (Tell an admin on server or discord before playing with!)" desc = "Sometimes one wishes upon a lucky star and obtains by pure chance great power! (TELL AN ADMIN ON DISCORD OR SERVER BEFORE PLAYING WITH)" /obj/item/weapon/grenade/spawnergrenade/casino/universal_technomancer/detonate() @@ -146,4 +151,4 @@ new /obj/item/weapon/technomancer_core/universal(T) qdel(src) - return \ No newline at end of file + return diff --git a/code/modules/projectiles/guns/launcher/confetti_ch.dm b/code/modules/projectiles/guns/launcher/confetti_ch.dm index ac474a2366..caeba1874c 100644 --- a/code/modules/projectiles/guns/launcher/confetti_ch.dm +++ b/code/modules/projectiles/guns/launcher/confetti_ch.dm @@ -53,5 +53,5 @@ /obj/item/weapon/gun/launcher/confetti_cannon/overdrive name = "overdrive confetti cannon" desc = "For those times when you absolutely need colored paper everywhere, EVERYWHERE." - confetti_charge = 50 - max_confetti = 50 \ No newline at end of file + confetti_charge = 100 + max_confetti = 100 \ No newline at end of file diff --git a/code/modules/vore/appearance/sprite_accessories_ch.dm b/code/modules/vore/appearance/sprite_accessories_ch.dm index f061de8ca5..1e4051199c 100644 --- a/code/modules/vore/appearance/sprite_accessories_ch.dm +++ b/code/modules/vore/appearance/sprite_accessories_ch.dm @@ -107,4 +107,11 @@ name = "Red Panda (Taur dual-color)" icon = 'icons/mob/vore/taurs_ch.dmi' icon_state = "redpanda_dc" - extra_overlay = "redpanda_dc_markings" \ No newline at end of file + extra_overlay = "redpanda_dc_markings" + +/datum/sprite_accessory/tail/taur/wolf/fatwolf_2c/fatwolfalt + name = "Fat Wolf dual-color-alt (Taur)" + icon = 'icons/mob/vore/taurs_ch.dmi' + icon_state = "fatwolfalt_s" + extra_overlay = "fatwolfalt_markings1" + //icon_sprite_tag = "fatwolf2c" \ No newline at end of file