cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1900 from CHOMPStationBot/upstream-merge-10236

Browse Source 
[MIRROR] Toys expansion
This commit is contained in:
Nadyr
2021-05-08 23:50:05 -04:00
committed by GitHub
parent bef7b25a07 65946e5c49
commit 1f33d5696f
16 changed files with 845 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/client/preference_setup/loadout/loadout_general.dm
View File

@@ -76,6 +76,7 @@
description = "Choose from a number of toys."
path = /obj/item/toy/
/* VOREStation removal
/datum/gear/toy/New()
..()
var/toytype = list()
@@ -86,7 +87,7 @@
toytype["Magic 8 Ball"] = /obj/item/toy/eight_ball
toytype["Magic Conch shell"] = /obj/item/toy/eight_ball/conch
gear_tweaks += new/datum/gear_tweak/path(toytype)
*/
/datum/gear/flask
display_name = "flask"

81
code/modules/client/preference_setup/loadout/loadout_general_vr.dm
View File

@@ -9,4 +9,83 @@
for(var/ball in typesof(/obj/item/toy/tennis/))
var/obj/item/toy/tennis/ball_type = ball
balls[initial(ball_type.name)] = ball_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(balls))
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(balls))
/datum/gear/character/
display_name = "miniature selection"
description = "Choose from a number of miniatures. From Battlemace 40 million to Grottos and Ghouls."
path = /obj/item/toy/character/alien
/datum/gear/character/New()
..()
var/list/characters = list()
for(var/character in typesof(/obj/item/toy/character/) - /obj/item/toy/character)
var/obj/item/toy/character/character_type = character
characters[initial(character_type.name)] = character_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(characters))
/datum/gear/mechtoy/
display_name = "mecha toy selection"
description = "Choose from a number of mech toys."
path = /obj/item/toy/mecha/ripley
/datum/gear/mechtoy/New()
..()
var/list/mechs = list()
for(var/mech in typesof(/obj/item/toy/mecha/) - /obj/item/toy/mecha/)
var/obj/item/toy/mecha/mech_type = mech
mechs[initial(mech_type.name)] = mech_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(mechs))
/datum/gear/toy/New()
..()
var/toytype = list()
toytype["Blink toy"] = /obj/item/toy/blink
toytype["Foam dart crossbow"] = /obj/item/toy/blink
toytype["Toy sword"] = /obj/item/toy/sword
toytype["Toy katana"] = /obj/item/toy/katana
toytype["Snap pops"] = /obj/item/weapon/storage/box/snappops
toytype["Plastic flowers"] = /obj/item/toy/bouquet/fake
toytype["Stick horse"] = /obj/item/toy/stickhorse
toytype["Toy X-mas tree"] = /obj/item/toy/xmastree
toytype["Fake handcuff kit"] = /obj/item/weapon/storage/box/handcuffs/fake
toytype["Gravitational singularity"] = /obj/item/toy/spinningtoy
toytype["Water flower"] = /obj/item/weapon/reagent_containers/spray/waterflower
toytype["Bosun's whistle"] = /obj/item/toy/bosunwhistle
toytype["Magic 8 Ball"] = /obj/item/toy/eight_ball
toytype["Magic Conch shell"] = /obj/item/toy/eight_ball/conch
toytype["Pet rock"] = /obj/item/toy/rock
toytype["Toy flash"] = /obj/item/toy/flash
toytype["Big Red Button"] = /obj/item/toy/redbutton
toytype["Garden gnome"] = /obj/item/toy/gnome
toytype["Toy AI"] = /obj/item/toy/AI
toytype["Hand buzzer"] = /obj/item/clothing/gloves/ring/buzzer/toy
toytype["Toy nuke"] = /obj/item/toy/nuke
toytype["Toy gibber"] = /obj/item/toy/minigibber
toytype["Toy xeno"] = /obj/item/toy/toy_xeno
gear_tweaks += new/datum/gear_tweak/path(toytype)
/datum/gear/chewtoy
display_name = "animal toy selection"
path = /obj/item/toy/chewtoy
/datum/gear/chewtoy/New()
..()
var/toytype = list()
toytype["Bone"] = /obj/item/toy/chewtoy
toytype["Classic"] = /obj/item/toy/chewtoy/tall
toytype["Mouse"] = /obj/item/toy/cat_toy
toytype["Feather rod"] = /obj/item/toy/cat_toy/rod
gear_tweaks += new/datum/gear_tweak/path(toytype)
/datum/gear/chewtoy_poly
display_name = "animal toy selection, colorable"
path = /obj/item/toy/chewtoy/poly
/datum/gear/chewtoy_poly/New()
..()
var/toytype = list()
toytype["Bone"] = /obj/item/toy/chewtoy/poly
toytype["Classic"] = /obj/item/toy/chewtoy/tall/poly
gear_tweaks += new/datum/gear_tweak/path(toytype)
gear_tweaks += gear_tweak_free_color_choice