Skip to content

Commit

Permalink
Merge branch 'ыфкфывфвф' into remastered_new_dev_proxima_2022_gold_ed…
Browse files Browse the repository at this point in the history
…ition
  • Loading branch information
Evie7056 committed Jun 20, 2023
2 parents 051f254 + b9e9e4f commit be679d3
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 1 deletion.
2 changes: 1 addition & 1 deletion code/datums/supplypacks/nonessent.dm
Original file line number Diff line number Diff line change
Expand Up @@ -357,5 +357,5 @@
)
containername = "plushies crate"
num_contained = 5
supply_method = /decl/supply_method/randomized/
supply_method = /decl/supply_method/randomized
cost = 25
42 changes: 42 additions & 0 deletions proxima/code/game/items/toys.dm
Original file line number Diff line number Diff line change
Expand Up @@ -35,182 +35,212 @@
/* LC plushes */
// The good guys
/obj/item/toy/plush/ayin
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "ayin plushie"
desc = "A plushie depicting a researcher that did <b>nothing wrong</b>." // Fight me
icon_state = "ayin"
gender = MALE

/obj/item/toy/plush/carmen
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "Carmen plushie"
desc = "A plushie depicting an ambitious and altruistic researcher."
icon_state = "carmen"
gender = FEMALE

// Sephirots
/obj/item/toy/plush/malkuth
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "Elijah plushie"
desc = "A plushie depicting famous Shell Unit. Her name is Elijah. What a diligent worker."
icon_state = "malkuth"
gender = FEMALE

/obj/item/toy/plush/yesod
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "Gabriel plushie"
desc = "A plushie depicting a Shell Research Unit in a turtleneck."
icon_state = "yesod"
gender = MALE

/obj/item/toy/plush/netzach
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "Giovani plushie"
desc = "A plushie depicting a Shell Unit that likes alcohol a bit too much."
icon_state = "netzach"
gender = MALE

/obj/item/toy/plush/hod
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "Michel plushie"
desc = "A plushie depicting a Shell Unit who hopes to make everything right."
icon_state = "hod"
gender = FEMALE

/obj/item/toy/plush/lisa
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "Lisa plushie"
desc = "A plushie depicting a Shell Unit with high expectations."
icon_state = "lisa"
gender = FEMALE

/obj/item/toy/plush/enoch
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "Enoch plushie"
desc = "A plushie depicting an optimistic Shell Unit with kind heart."
icon_state = "enoch"
gender = MALE

/obj/item/toy/plush/chesed
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "Daniel plushie"
desc = "A plushie depicting a sleepy Shell Unit with a mug of coffee in their hand."
icon_state = "chesed"
gender = MALE

/obj/item/toy/plush/gebura
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "Kali plushie"
desc = "A plushie depicting very strong and brave Shell Unit."
icon_state = "gebura"
gender = FEMALE

/obj/item/toy/plush/hokma
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "Benjamin plushie"
desc = "A plushie depicting a wise Shell Unit with a fancy monocle. He knows much more than you."
icon_state = "hokma"
gender = MALE

/obj/item/toy/plush/binah
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "Garion plushie"
desc = "A plushie depicting a sadistic Shell Unit who lacks any emotions."
icon_state = "binah"
gender = FEMALE

/obj/item/toy/plush/angela
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "Angela plushie"
desc = "A plushie depicting The Supreme AI."
icon_state = "angela"
gender = FEMALE

//Limbus Sinners
/obj/item/toy/plush/yisang
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "Yi sang plushie"
desc = "A plushie depicting a ruminating sinner."
icon_state = "yisang"
gender = MALE

/obj/item/toy/plush/faust
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "Faust plushie"
desc = "A plushie depicting an insufferable sinner."
icon_state = "faust"
gender = FEMALE

/obj/item/toy/plush/don
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "Don Quixote plushie"
desc = "A plushie depicting a heroic sinner."
icon_state = "don"
gender = FEMALE

/obj/item/toy/plush/ryoshu
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "Ryoshu plushie"
desc = "A plushie depicting a artistic sinner."
icon_state = "ryoshu"
gender = FEMALE

/obj/item/toy/plush/meursault
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "Meursault plushie"
desc = "A plushie depicting a neutral sinner."
icon_state = "meursault"
gender = MALE

/obj/item/toy/plush/honglu
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "Hong Lu plushie"
desc = "A plushie depicting a sheltered sinner."
icon_state = "honglu"
gender = MALE

/obj/item/toy/plush/heathcliff
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "Heathcliff plushie"
desc = "A plushie depicting a brash sinner."
icon_state = "heathcliff"
gender = MALE

/obj/item/toy/plush/ishmael
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "Ishmael plushie"
desc = "A plushie depicting a reliable sinner."
icon_state = "ishmael"
gender = FEMALE

/obj/item/toy/plush/rodion
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "Rodion plushie"
desc = "A plushie depicting a backstreets born sinner."
icon_state = "rodion"
gender = FEMALE

/obj/item/toy/plush/sinclair
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "Sinclair plushie"
desc = "A plushie depicting a insecure sinner."
icon_state = "sinclair"
gender = MALE

/obj/item/toy/plush/dante
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "Dante plushie"
desc = "A plushie depicting a clock headed manager."
icon_state = "dante"
gender = MALE

/obj/item/toy/plush/outis
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "Outis plushie"
desc = "A plushie depicting a strategic sinner."
icon_state = "outis"
gender = FEMALE

/obj/item/toy/plush/gregor
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "bug guy plushie"
desc = "A plushie depicting a genetically altered sinner."
icon_state = "gregor"
gender = MALE

// Misc LC stuff
/obj/item/toy/plush/pierre
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "Pierre plushie"
desc = "A plushie depicting a friendly cook."
icon_state = "pierre"
gender = FEMALE

/obj/item/toy/plush/myo
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "Myo plushie"
desc = "A plushie depicting a mercenary captain."
icon_state = "myo"
gender = FEMALE

/obj/item/toy/plush/rabbit
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "rabbit plushie"
desc = "A plushie depicting a Tau Cetian mercenary."
icon_state = "rabbit"

/obj/item/toy/plush/yuri
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "yuri plushie"
desc = "A plushie depicting an The Cuchulain Foundation employee."
icon_state = "yuri"
Expand All @@ -226,69 +256,81 @@
// to_chat(user, "<span class='notice'>You feel as if you prevented something weird and terrible from happening again.</span>")

/obj/item/toy/plush/blank
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "plushie blank"
desc = "A humanoid plush that had been freshly made or stripped down to its cloth. Despite its lack of identity, the mere aknowelegement of this plushie makes it unique."
icon_state = "blank"


// Abnormalities
/obj/item/toy/plush/qoh
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "queen of hatred plushie"
desc = "A plushie depicting a magical girl whose goal is fighting all evil in the universe!"
icon_state = "qoh"
gender = FEMALE

/obj/item/toy/plush/kog
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "king of greed plushie"
desc = "A plushie depicting a magical girl whose desires got the best of her."
icon_state = "kog"
gender = FEMALE

/obj/item/toy/plush/kod
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "knight of despair plushie"
desc = "A plushie depicting a magical girl who abandoned those who needed her most."
icon_state = "kod"
gender = FEMALE

/obj/item/toy/plush/sow
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "servant of wrath plushie"
desc = "A plushie depicting a magical girl who was betrayed by someone they trusted dearly."
icon_state = "sow"
gender = FEMALE

/obj/item/toy/plush/nihil
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "jester of nihil plushie"
desc = "A plushie depicting a black and white jester, usually found alongside the magical girls."
icon_state = "nihil"

/obj/item/toy/plush/bigbird
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "big bird plushie"
desc = "A plushie depicting a big bird with a lantern that burns forever. How does it even work..?"
icon_state = "bigbird"

/obj/item/toy/plush/mosb
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "mountain of smiling bodies plushie"
desc = "A plushie depicting a mountain of corpses merged into one. Yuck!"
icon_state = "mosb"

/obj/item/toy/plush/big_bad_wolf
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "big and will be bad wolf plushie"
desc = "A plushie depicting quite a not so bad and very much so marketable wolf plush."
icon_state = "big_bad_wolf"

/obj/item/toy/plush/melt
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "melting love plushie"
desc = "A plushie depicting a slime girl, you think."
icon_state = "melt"

/obj/item/toy/plush/scorched
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "scorched girl plushie"
desc = "A plushie depicting scorched girl."
icon_state = "scorched"
gender = FEMALE

// Others
/obj/item/toy/plush/bongbong
icon = 'proxima/icons/obj/lc_plushes.dmi'
name = "bongbong plushie"
desc = "A plushie depicting the The Cuchulain Foundation"
icon_state = "bongbong"
Expand Down

0 comments on commit be679d3

Please sign in to comment.