cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-22 04:37:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Christmas time is once a year..

Browse Source 
Made changes to allow casino manual to fit into the casino wallet for easy reading.
Made Santa's sack! Only he can take presents from it!
Made the new presents have a nice wide selection of gifts, but chaos presents are disabled so far!
Fixed 'the cake' somewhat and made a grenade to spawn its components.
made Santa's coat.
made an overdrive version of the confetti gun.
This commit is contained in:
Shadowfire
2020-12-17 17:20:24 +01:00
parent 35ddbf4589
commit 6b70b133ba
13 changed files with 228 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/gift_wrappaper_ch.dm
+105 -50
View File
@@ -15,6 +15,7 @@
pixel_x = rand(-10,10)
pixel_y = rand(-10,10)
/* DISABLED FOR NOW: STRONG TOYS IN REWARDS OF POOL - Jack
chaos = rand(1, 100)
if(chaos == 1)
icon_state = "gift_chaos"
@@ -22,60 +23,114 @@
else
icon_state = "gift[pick("1", "2", "3")]_[pick("g", "r", "b", "y", "p")]"
chaos = FALSE
*/
icon_state = "gift[pick("1", "2", "3")]_[pick("g", "r", "b", "y", "p")]"
item_state = icon_state
chaos = FALSE
return
/obj/item/weapon/a_gift/advanced/attack_self(mob/M as mob) //WIP - add more items to list! - Jack
var/gift_type = pick(
/obj/item/weapon/storage/wallet,
/obj/item/weapon/storage/photo_album,
/obj/item/weapon/storage/box/snappops,
/obj/item/weapon/storage/fancy/crayons,
/obj/item/weapon/storage/backpack/holding,
/obj/item/weapon/storage/belt/champion,
/obj/item/weapon/soap/deluxe,
/obj/item/weapon/pickaxe/silver,
/obj/item/weapon/pen/invisible,
/obj/item/weapon/lipstick/random,
/obj/item/weapon/grenade/smokebomb,
/obj/item/weapon/corncob,
/obj/item/weapon/contraband/poster,
/obj/item/weapon/book/manual/barman_recipes,
/obj/item/weapon/book/manual/chef_recipes,
/obj/item/weapon/bikehorn,
/obj/item/weapon/beach_ball,
/obj/item/weapon/beach_ball/holoball,
/obj/item/toy/balloon,
/obj/item/toy/blink,
/obj/item/toy/crossbow,
/obj/item/weapon/gun/projectile/revolver/capgun,
/obj/item/toy/katana,
/obj/item/toy/mecha/deathripley,
/obj/item/toy/mecha/durand,
/obj/item/toy/mecha/fireripley,
/obj/item/toy/mecha/gygax,
/obj/item/toy/mecha/honk,
/obj/item/toy/mecha/marauder,
/obj/item/toy/mecha/mauler,
/obj/item/toy/mecha/odysseus,
/obj/item/toy/mecha/phazon,
/obj/item/toy/mecha/ripley,
/obj/item/toy/mecha/seraph,
/obj/item/toy/spinningtoy,
/obj/item/toy/sword,
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus,
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris,
/obj/item/device/paicard,
/obj/item/device/instrument/violin,
/obj/item/weapon/storage/belt/utility/full,
/obj/item/clothing/accessory/tie/horrible)
var/gift_type_advanced = pick(
/obj/item/device/binoculars/spyglass,
/obj/item/device/bodysnatcher,
/obj/item/device/cataloguer/advanced,
/obj/item/device/flashlight/slime,
/obj/item/device/lightreplacer,
/obj/item/weapon/book/tome,
/obj/item/weapon/cell/device/weapon/recharge/alien/hybrid,
/obj/item/weapon/disk/nifsoft/compliance,
/obj/item/weapon/implanter/adrenalin,
/obj/item/weapon/lego,
/obj/item/weapon/moneybag,
/obj/item/weapon/pickaxe/diamonddrill,
/obj/item/weapon/rcd/advanced/loaded,
/obj/item/weapon/bluespace_harpoon,
/obj/item/weapon/storage/backpack/dufflebag/syndie,
/obj/item/weapon/storage/belt/medical/alien,
/obj/item/weapon/storage/toolbox/syndicate/powertools,
/obj/item/weapon/surgical/FixOVein/alien,
/obj/item/weapon/surgical/bone_clamp/alien,
/obj/item/weapon/surgical/cautery/alien,
/obj/item/weapon/surgical/circular_saw/alien,
/obj/item/weapon/surgical/hemostat/alien,
/obj/item/weapon/surgical/retractor/alien,
/obj/item/weapon/surgical/scalpel/alien,
/obj/item/weapon/surgical/surgicaldrill/alien,
/obj/item/weapon/sword/fluff/joanaria/scisword,
/obj/item/weapon/tool/wrench/alien,
/obj/item/weapon/tool/wirecutters/alien,
/obj/item/weapon/tool/screwdriver/alien,
/obj/item/weapon/tool/crowbar/alien,
/obj/item/weapon/weldingtool/alien,
/obj/item/weapon/twohanded/fireaxe/fluff/mjollnir,
/obj/item/weapon/gun/launcher/confetti_cannon/overdrive,
/obj/item/weapon/gun/energy/sizegun,
/obj/item/weapon/gun/energy/netgun,
/obj/item/weapon/storage/belt/utility/alien,
/obj/item/clothing/suit/armor/alien,
/obj/item/clothing/glasses/monocoole,
/obj/item/weapon/reagent_containers/spray/chemsprayer,
/obj/item/weapon/reagent_containers/glass/beaker/bluespace,
/obj/item/weapon/reagent_containers/glass/beaker/noreact,
/obj/item/weapon/storage/box/casino/costume_whitebunny,
/obj/item/weapon/storage/box/casino/costume_blackbunny,
/obj/item/weapon/storage/box/casino/costume_sexymime,
/obj/item/weapon/storage/box/casino/costume_sexyclown,
/obj/item/weapon/storage/box/casino/costume_nyangirl,
/obj/item/weapon/storage/box/casino/costume_wizard,
/obj/item/weapon/storage/box/casino/costume_chicken,
/obj/item/weapon/storage/box/casino/costume_gladiator,
/obj/item/weapon/storage/box/casino/costume_pirate,
/obj/item/weapon/storage/box/casino/costume_commie,
/obj/item/weapon/storage/box/casino/costume_imperiummonk,
/obj/item/weapon/storage/box/casino/costume_plaguedoctor,
/obj/item/weapon/storage/box/casino/costume_cutewitch,
/obj/item/weapon/grenade/spawnergrenade/casino,
/obj/item/weapon/grenade/spawnergrenade/casino/goat,
/obj/item/weapon/grenade/spawnergrenade/casino/armadillo,
/obj/item/weapon/grenade/spawnergrenade/casino/cat,
/obj/item/weapon/grenade/spawnergrenade/casino/chicken,
/obj/item/weapon/grenade/spawnergrenade/casino/cow,
/obj/item/weapon/grenade/spawnergrenade/casino/corgi,
/obj/item/weapon/grenade/spawnergrenade/casino/fox,
/obj/item/weapon/grenade/spawnergrenade/casino/lizard,
/obj/item/weapon/grenade/spawnergrenade/casino/penguin,
/obj/item/weapon/grenade/spawnergrenade/casino/snake,
/obj/item/weapon/grenade/spawnergrenade/casino/yithian,
/obj/item/weapon/grenade/spawnergrenade/casino/tindalos,
/obj/item/weapon/grenade/spawnergrenade/casino/fennec,
/obj/item/weapon/grenade/spawnergrenade/casino/redpanda,
/obj/item/weapon/grenade/spawnergrenade/casino/horse,
/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)
if(!ispath(gift_type,/obj/item)) return
var/gift_type_chaos = pick(
/obj/item/weapon/lego/gib,
/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)
var/obj/item/I = new gift_type(M)
M.remove_from_mob(src)
M.put_in_hands(I)
I.add_fingerprint(M)
qdel(src)
return
if(!ispath(gift_type_advanced,/obj/item)) return
var/obj/item/I1 = new gift_type_advanced(M)
if(chaos == TRUE)
var/obj/item/I2 = new gift_type_chaos(M)
M.remove_from_mob(src)
M.put_in_hands(I2)
I2.add_fingerprint(M)
qdel(src)
return
else
M.remove_from_mob(src)
M.put_in_hands(I1)
I1.add_fingerprint(M)
qdel(src)
return
code/game/objects/items/weapons/grenades/spawnergrenade_ch.dm
+35 -1
View File
@@ -112,4 +112,38 @@
/obj/item/weapon/grenade/spawnergrenade/casino/zorgoia
desc = "It is set to detonate in 5 seconds. It will release a zorgoia that has been won from the golden goose casino!"
name = "Casino Creature Container (Zorgoia)"
spawner_type = /mob/living/simple_mob/otie/zorgoia/friendly
spawner_type = /mob/living/simple_mob/otie/zorgoia/friendly
/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.."
name = "Mysterious Grenade"
spawner_type = null
/obj/item/weapon/grenade/spawnergrenade/casino/infinitycake/detonate()
var/turf/T = get_turf(src)
playsound(T, 'sound/effects/phasein.ogg', 100, 1)
new /obj/structure/thecake(T)
new /obj/item/weapon/thecake_layer(T)
new /obj/item/weapon/thecake_layer/three(T)
new /obj/item/weapon/thecake_layer/four(T)
new /obj/item/weapon/thecake_layer/five(T)
new /obj/item/weapon/thecake_layer/six(T)
qdel(src)
return
/obj/item/weapon/grenade/spawnergrenade/casino/universal_technomancer
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()
var/turf/T = get_turf(src)
playsound(T, 'sound/effects/phasein.ogg', 100, 1)
new /obj/item/weapon/technomancer_catalog/universal(T)
new /obj/item/weapon/technomancer_core/universal(T)
qdel(src)
return