From a5e0f1f712af7ea126ba90fa2b0d2ee3d429b43b Mon Sep 17 00:00:00 2001 From: courierbravo <73250577+courierbravo@users.noreply.github.com> Date: Sat, 7 Sep 2024 09:32:58 -0700 Subject: [PATCH] The Great Sticker Update (#19867) Added 79 new stickers. 60 by LforLouise, 1 by Noble Row, 2 by Ben10083, 10 by Hazelmouse, 1 by Mr.Popper, 4 by FabianK3, and 1 by Kermit. Added sticker sheets, a storage that can only store stickers. Sprite by Noble Row Added the new sticker sheets to the loadout menu Replaced gold star and googly eye boxes with sticker sheets. --- aurorastation.dme | 1 + code/game/objects/items/sticker.dm | 432 +++++++++++++++++- .../objects/items/weapons/storage/boxes.dm | 12 - .../items/weapons/storage/stickersheets.dm | 168 +++++++ .../closets/secure/operations.dm | 2 +- .../crates_lockers/closets/secure/security.dm | 2 +- .../modules/cargo/random_stock/t2_uncommon.dm | 2 +- .../preference_setup/loadout/items/toy.dm | 24 + html/changelogs/courierbravo-stickers.yml | 61 +++ icons/obj/sticker.dmi | Bin 1021 -> 13421 bytes maps/away/ships/scc/scc_scout_ship.dmm | 2 +- 11 files changed, 685 insertions(+), 21 deletions(-) create mode 100644 code/game/objects/items/weapons/storage/stickersheets.dm create mode 100644 html/changelogs/courierbravo-stickers.yml diff --git a/aurorastation.dme b/aurorastation.dme index 76924a35f12..23570b43376 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1338,6 +1338,7 @@ #include "code\game\objects\items\weapons\storage\pill_bottle.dm" #include "code\game\objects\items\weapons\storage\secure.dm" #include "code\game\objects\items\weapons\storage\slime_core_bag.dm" +#include "code\game\objects\items\weapons\storage\stickersheets.dm" #include "code\game\objects\items\weapons\storage\storage.dm" #include "code\game\objects\items\weapons\storage\toolbox.dm" #include "code\game\objects\items\weapons\storage\uplink_kits.dm" diff --git a/code/game/objects/items/sticker.dm b/code/game/objects/items/sticker.dm index a6b3e9557f6..6bb5ec5727c 100644 --- a/code/game/objects/items/sticker.dm +++ b/code/game/objects/items/sticker.dm @@ -72,12 +72,434 @@ attached_atom.remove_vis_contents(src) attached = null -/obj/item/sticker/googly_eye +// +//generic stickers, catch all for anything that doesn't fit in another category +// +/obj/item/sticker/generic + name = "sccv horizon sticker" + desc = "A sticker of the vague shape of the SCCV Horizon." + icon_state = "sccvhorizon" + +/obj/item/sticker/generic/goldstar + name = "gold star" + desc = "A sticker of a gold star, for those overachievers." + icon_state = "goldstar" + +/obj/item/sticker/generic/googly_eye name = "googly eye" desc = "A large googly eye sticker." rand_icons = list("googly", "googly1", "googly2") -/obj/item/sticker/goldstar - name = "gold star" - desc = "A sticker of a gold star, for those overachievers." - icon_state = "goldstar" +/obj/item/sticker/generic/sol + name = "sol flag" + desc = "A vinyl sticker of the ASSN's flag." + icon_state = "sol" + +/obj/item/sticker/generic/sancolette + name = "san collete sticker" + desc = "A round sticker of the San Colette flag." + icon_state = "sancolette" + +/obj/item/sticker/generic/domadice + name = "domadice sticker" + desc = "A vinyl sticker of the Domadice plush. Popular with a niche crowd." + icon_state = "domadice" + +/obj/item/sticker/generic/schlorgo + name = "schlorgo sticker" + desc = "A sticker of the Schlorgo. A penguin like animal mostly made of fat, renowned for its resistance to all blunt force." + icon_state = "schlorgo" + +/obj/item/sticker/generic/peace + name = "peace sign sticker" + desc = "A peace sign, white on a black background. It has become a universal symbol among humans, \ + and still remains popular among student protestors to this day." + icon_state = "peace" + +/obj/item/sticker/generic/smile + name = "smiley face sticker" + desc = "A yellow smiley face. A meme 500 years old, the universal sign for positivity. :)" + icon_state = "smile" + +// +//All of the major corporations logos. Unless we add or remove a megacorp, these should remain unchanged. +// +/obj/item/sticker/corporate + name = "scc sticker" + desc = "A sticker of the Stellar Corporate Conglomerate's logo." + icon_state = "scc" + +/obj/item/sticker/corporate/nt + name = "nanotrasen sticker" + desc = "A sticker of the NanoTrasen Corporation logo" + icon_state = "nanotrasen" + +/obj/item/sticker/corporate/zavodskoi + name = "zavodskoi sticker" + desc = "A sticker of the Zavodskoi Interstellar logo." + icon_state = "zavodskoi" + +/obj/item/sticker/corporate/hephaestus1 + name = "orange hephaestus sticker" + desc = "A sticker of the Hephaestus Industries logo." + icon_state = "hephaestus" + +/obj/item/sticker/corporate/hephaestus2 + name = "green hephaestus sticker" + desc = "A sticker of the Hephaestus Industries logo." + icon_state = "hephaestus2" + +/obj/item/sticker/corporate/idris + name = "idris sticker" + desc = "A sticker of the Idris Incorporated logo." + icon_state = "idris" +// +//Anything religion specific stickers go here. +// +/obj/item/sticker/religious + name = "triple goddess sticker" + desc = "A sticker of Luna, in her waxing, full, and waning phases. A symbol that can represent many neopagan religious movements." + icon_state = "threemoongoddess" + +/obj/item/sticker/religious/cross + name = "cross sticker" + desc = "A simple black and white sticker of a cross. As genericly christian as possible, usable by just about any branch." + icon_state = "cross" + +/obj/item/sticker/religious/crucifix + name = "crucifix sticker" + desc = "A golden crucifix sticker. Vampire warding power not guaranteed." + icon_state = "crucifix" + +//I'm sure there's a better name than islam for this, but it was the name on the sprite when i first got it. And its kinda funny to just call it "islam." +/obj/item/sticker/religious/islam + name = "star and crescent sticker" + desc = "A yellow star and crescent on a blue background. As generically islamic as possible." + icon_state = "islam" + +/obj/item/sticker/religious/twinsuns + name = "twin suns sticker" + desc = "A vinyl sticker of the Tajaran Twin Suns." + icon_state = "twinsuns" + +/obj/item/sticker/religious/luceism + name = "luceism sticker" + desc = "A vinyl sticker of the Luceian Square, a major holy symbol of Luceism." + icon_state = "luceism" + +/obj/item/sticker/religious/tribunal + name = "tribunal eye sticker" + desc = "A red and black vinyl sticker of the Tribunal Eye, the main religious symbol of Tribunalism." + icon_state = "tribunal" + +/obj/item/sticker/religious/trinary + name = "trinary sticker" + desc = "A vinyl sticker, depicting a religious symbol of the Trinary Perfection." + icon_state = "trinary" + +// +//All the flagpole stickers made by LforLouise. +// + +/obj/item/sticker/flagpole + name = "white flagp sticker" + desc = "A white flag on a flagpole." + icon_state = "poleflagtemplate" + +/obj/item/sticker/flagpole/biesel + name = "biesel flag sticker" + desc = "The flag of the Republic of Biesel on a flagpole." + icon_state = "bieselpole" + +/obj/item/sticker/flagpole/biesel/gibson + name = "new gibson flag sticker" + desc = "The flag of New Gibson on a flagpole." + icon_state = "gibsonpole" + +/obj/item/sticker/flagpole/biesel/mictlan + name = "mictlan flag sticker" + desc = "The flag of Mictlan on a flagpole." + icon_state = "mictlanpole" + +/obj/item/sticker/flagpole/biesel/valkyrie + name = "valkyrie flag sticker" + desc = "The flag of Valkyrie on a flagpole." + icon_state = "valkyriepole" + +/obj/item/sticker/flagpole/biesel/port_antilla + name = "port antilla flag sticker" + desc = "The flag of Port Antilla on a flagpole." + icon_state = "portantillapole" + +/obj/item/sticker/flagpole/persepolis + name = "persepolis flag sticker" + desc = "The flag of Persepolis on a flagpole." + icon_state = "persepolispole" + +/obj/item/sticker/flagpole/persepolis/aemaq + name = "aemaq flag sticker" + desc = "The flag of Aemaq on a flagpole." + icon_state = "aemaqpole" + +/obj/item/sticker/flagpole/persepolis/damascus + name = "damascus flag sticker" + desc = "The flag of Damascus II on a flagpole." + icon_state = "damascuspole" + +/obj/item/sticker/flagpole/persepolis/medinapole + name = "medina flag sticker" + desc = "The flag of Medina on a flagpole." + icon_state = "medinapole" + +/obj/item/sticker/flagpole/persepolis/newsuez + name = "new suez flag sticker" + desc = "The flag of New Suez on a flagpole." + icon_state = "newsuezpole" + +/obj/item/sticker/flagpole/assn + name = "assn flag sticker" + desc = "The flag of the Alliance of Sovereign Solarian Nations on a flagpole." + icon_state = "assnpole" + +/obj/item/sticker/flagpole/assn/callisto + name = "callisto flag sticker" + desc = "The flag of Callisto on a flagpole." + icon_state = "callistopole" + +/obj/item/sticker/flagpole/assn/europa + name = "europa flag sticker" + desc = "The flag of Europa on a flagpole." + icon_state = "europapole" + +/obj/item/sticker/flagpole/assn/luna + name = "luna flag sticker" + desc = "The flag of Luna on a flagpole." + icon_state = "lunapole" + +/obj/item/sticker/flagpole/assn/mars + name = "mars flag sticker" + desc = "The flag of Mars on a flagpole." + icon_state = "marspole" + +/obj/item/sticker/flagpole/assn/pluto + name = "pluto flag sticker" + desc = "The flag of Pluto on a flagpole." + icon_state = "plutopole" + +/obj/item/sticker/flagpole/assn/venus + name = "venus flag" + desc = "The flag of Venus on a flagpole." + icon_state = "venuspole" + +/obj/item/sticker/flagpole/assn/newhaiphong + name = "new hai phong sticker" + desc = "The flag of New Hai Phong on a flagpole." + icon_state = "newhaiphongpole" + +/obj/item/sticker/flagpole/assn/sancolette + name = "san colette sticker" + desc = "The flag of San Colette on a flagpole." + icon_state = "sancolettepole" + +/obj/item/sticker/flagpole/assn/silversun + name = "silversun sticker" + desc = "The flag of Silversun on a flagpole." + icon_state = "silversunpole" + +/obj/item/sticker/flagpole/assn/visegrad + name = "visegrad sticker" + desc = "The flag of Visegrad on a flagpole." + icon_state = "visegradpole" + +/obj/item/sticker/flagpole/coalition + name = "coalition of colonies sticker" + desc = "The flag of the Coalition of Colonies on a flagpole." + icon_state = "cocpole" + +/obj/item/sticker/flagpole/coalition/assunzione + name = "assunzione flag sticker" + desc = "The flag of Assunzione on a flagpole." + icon_state = "assunzionepole" + +/obj/item/sticker/flagpole/coalition/burzsiapole + name = "burzsia flag sticker" + desc = "The flag of Burzsia on a flagpole." + icon_state = "burzsiapole" + +/obj/item/sticker/flagpole/coalition/gadpathur + name = "gadpathur flag sticker" + desc = "The flag of Gadpathur on a flagpole." + icon_state = "gadpathurpole" + +/obj/item/sticker/flagpole/coalition/galatea + name = "galatea flag sticker" + desc = "The flag of Galatea on a flagpole." + icon_state = "galateapole" + +/obj/item/sticker/flagpole/coalition/himeo + name = "himeo flag sticker" + desc = "The flag of himeo on a flagpole." + icon_state = "himeopole" + +/obj/item/sticker/flagpole/coalition/konyang + name = "konyang flag sticker" + desc = "The flag of Konyang on a flagpole." + icon_state = "konyangpole" + +/obj/item/sticker/flagpole/coalition/scarab + name = "scarab emblem sticker" + desc = "The flag of the symbol of the Scarabs confederation on a flagpole." + icon_state = "scarabpole" + +/obj/item/sticker/flagpole/coalition/xanu + name = "all xanu repiblic flag sticker" + desc = "The flag of the All Xanu-Republic on a flagpole." + icon_state = "xanupole" + +/obj/item/sticker/flagpole/coalition/vysoka + name = "vysoka flag sticker" + desc = "The flag of Vysoka on a flagpole." + icon_state = "vysokapole" + +/obj/item/sticker/flagpole/dominia + name = "moroz flag sticker" + desc = "The flag of Moroz and the Keeser Royal Family on a flagpole." + icon_state = "morozpole" + +/obj/item/sticker/flagpole/dominia/caladius + name = "caladius flag sticker" + desc = "The flag and standard of House Caladius on a flagpole." + icon_state = "caladiuspole" + +/obj/item/sticker/flagpole/dominia/volvalaad + name = "volvalaad flag sticker" + desc = "The flag and standard of House Volvalaad on a flagpole." + icon_state = "volvalaadpole" + +/obj/item/sticker/flagpole/dominia/zhao + name = "zhao flag sticker" + desc = "The flag and standard of House Zhao on a flagpole." + icon_state = "zhaopole" + +/obj/item/sticker/flagpole/dominia/strelitzpole + name = "strelitz flag sticker" + desc = "The flag and standard of House Strelitz on a flagpole." + icon_state = "strelitzpole" + +/obj/item/sticker/flagpole/dominia/kazhkz + name = "kazhkz flag sticker" + desc = "The flag and standard of House Kazhkz on a flagpole." + icon_state = "kazhkzpole" + +/obj/item/sticker/flagpole/dominia/hansan + name = "han'san flag sticker" + desc = "The flag and standard of Clan Han'san on a flagpole." + icon_state = "hansanpole" + +/obj/item/sticker/flagpole/dominia/frontier + name = "imperial frontier flag sticker" + desc = "The flag of the Imperial Frontier on a flagpole." + icon_state = "frontierpole" + +/obj/item/sticker/flagpole/nralakk + name = "nralakk federation flag sticker" + desc = "The flag of the Nralakk Federation on a flagpole." + icon_state = "nralakkfedpole" + +/obj/item/sticker/flagpole/nralakk/aweiji + name = "aweiji flag sticker" + desc = "The flag of Aweiji on a flagpole." + icon_state = "aweijipole" + +/obj/item/sticker/flagpole/nralakk/aloise + name = "aloise flag sticker" + desc = "The flag of Aloise on a flagpole." + icon_state = "aloisepole" + +/obj/item/sticker/flagpole/nralakk/xrim + name = "xrim flag sticker" + desc = "The flag of Xrim on a flagpole." + icon_state = "xrimpole" + +/obj/item/sticker/flagpole/adhomai + name = "pra flag sticker" + desc = "The flag of the People's Republic of Adhomai on a flagpole." + icon_state = "prapole" + +/obj/item/sticker/flagpole/adhomai/dpra + name = "dpra flag sticker" + desc = "The flag of the Democratic People's Republic of Adhomai on a flagpole." + icon_state = "dprapole" + +/obj/item/sticker/flagpole/adhomai/nka + name = "nka flag sticker" + desc = "The flag of the New Kingdom of Adhomai on a flagpole." + icon_state = "nkapole" + +/obj/item/sticker/flagpole/adhomai/crevus + name = "crevus flag sticker" + desc = "The flag of the Free City of Crevus on a flagpole." + icon_state = "crevuspole" + +/obj/item/sticker/flagpole/hieroaetheria + name = "consortium flag sticker" + desc = "The flag of The Consortium of Hieroaetheria on a flagpole." + icon_state = "consortiumpole" + +/obj/item/sticker/flagpole/hieroaetheria/ekane + name = "ekane flag sticker" + desc = "The flag of the Eternal Republic of the Ekane on a flagpole." + icon_state = "ekanepole" + +/obj/item/sticker/flagpole/hieroaetheria/glaorr + name = "gla'orr flag sticker" + desc = "The flag of the Union of Gla'orr on a flagpole." + icon_state = "glaorrpole" + +/obj/item/sticker/flagpole/hegemony + name = "hegemony flag sticker" + desc = "The flag of the Hegemony on a flagpole." + icon_state = "hegemonypole" + +/obj/item/sticker/flagpole/hegemony/ouerea + name = "ouerea flag sticker" + desc = "The flag of Ouerea on a flagpole." + icon_state = "ouereapole" + +/obj/item/sticker/flagpole/hegemony/queendom + name = "sezk-hakh queendom flag sticker" + desc = "The flag of the Queendom of Sezk-Hakh on a flagpole." + icon_state = "queendompole" + +// +//Anti Establishment flags, for the once were's and freedom fighters. +// +// Fishanduh, exiled to Xanu Prime +/obj/item/sticker/flagpole/resistance + name = "fisanduh flag sticker" + desc = "The flag of the Confederated States of Fisanduh on a flagpole." + icon_state = "fisanduhpole" + +//Free Tajaran Council, exiled to Himeo +/obj/item/sticker/flagpole/resistance/ftc + name = "free tajaran council sticker" + desc = "The flag of the Free Tajaran Council on a flagpole." + icon_state = "ftcpole" + +//Traverse Resistance, exiled to Biesel. +/obj/item/sticker/flagpole/resistance/traverse + name = "traverse resistance flag sticker" + desc = "The flag of on a flagpole." + icon_state = "freetraversepole" + +//Old Konyang, handed its L during the civil war by CoC Konyang. +/obj/item/sticker/flagpole/resistance/solkonyang + name = "old konyang flag sticker" + desc = "The old Solarian flag of Konyang on a flagpole." + icon_state = "solkonyangpole" + +//Ouerea Rebels, in truce with the establishment... for now. +/obj/item/sticker/flagpole/resistance/newouerea + name = "new ouerea flag sticker" + desc = "The flag of on a flagpole." + icon_state = "newouereapole" diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 8a45dfa3f27..4f79cdc6be3 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -1096,18 +1096,6 @@ CT_1.linked_teleporter = CT_2 CT_2.linked_teleporter = CT_1 -/obj/item/storage/box/googly - name = "googly eye box" - desc = "A box containing googly eyes." - illustration = "googlyeyes" - starts_with = list(/obj/item/sticker/googly_eye = 8) - -/obj/item/storage/box/goldstar - name = "gold star box" - desc = "A box containing gold star stickers." - illustration = "goldstar" - starts_with = list(/obj/item/sticker/goldstar = 8) - /obj/item/storage/box/folders name = "box of folders" desc = "A box full of folders." diff --git a/code/game/objects/items/weapons/storage/stickersheets.dm b/code/game/objects/items/weapons/storage/stickersheets.dm new file mode 100644 index 00000000000..239db756afc --- /dev/null +++ b/code/game/objects/items/weapons/storage/stickersheets.dm @@ -0,0 +1,168 @@ +/obj/item/storage/stickersheet + name = "sticker sheet" + desc = "A sheet of stickers, made of vinyl material. Perfect for decorating anything and everything!" + icon = 'icons/obj/sticker.dmi' + icon_state = "sticker_sheet" + item_state = "sticker_sheet" + contained_sprite = TRUE + display_contents_with_number = TRUE + force = 0 + throw_speed = 1 + throw_range = 2 + w_class = WEIGHT_CLASS_SMALL + max_w_class = WEIGHT_CLASS_TINY + max_storage_space = 12 + can_hold = list( + /obj/item/sticker + ) + +/obj/item/storage/stickersheet/goldstar + name = "gold star sticker sheet" + starts_with = list( + /obj/item/sticker/generic/goldstar = 12 + ) + +/obj/item/storage/stickersheet/googly_eye + name = "googly eye sticker sheet" + starts_with = list( + /obj/item/sticker/generic/googly_eye = 12 + ) + +/obj/item/storage/stickersheet/generic + name = "generic sticker sheet" + starts_with = list( + /obj/item/sticker/generic/sol = 2, + /obj/item/sticker/generic/sancolette = 2, + /obj/item/sticker/generic/domadice = 2, + /obj/item/sticker/generic/schlorgo = 2, + /obj/item/sticker/generic/peace = 2, + /obj/item/sticker/generic/smile = 2 + ) + +/obj/item/storage/stickersheet/religion + name = "religious sticker sheet" + starts_with = list( + /obj/item/sticker/religious = 1, + /obj/item/sticker/religious/cross = 1, + /obj/item/sticker/religious/crucifix = 1, + /obj/item/sticker/religious/islam = 1, + /obj/item/sticker/religious/twinsuns = 2, + /obj/item/sticker/religious/luceism = 2, + /obj/item/sticker/religious/tribunal = 2, + /obj/item/sticker/religious/trinary = 2 + ) + +/obj/item/storage/stickersheet/domadice + name = "domadice sticker sheet" + starts_with = list( + /obj/item/sticker/generic/domadice = 12 + ) + +/obj/item/storage/stickersheet/biesel + name = "republic of biesel sticker sheet" + starts_with = list( + /obj/item/sticker/flagpole/biesel = 4, + /obj/item/sticker/flagpole/biesel/gibson = 2, + /obj/item/sticker/flagpole/biesel/mictlan = 2, + /obj/item/sticker/flagpole/biesel/valkyrie = 2, + /obj/item/sticker/flagpole/biesel/port_antilla = 2 + ) + +/obj/item/storage/stickersheet/elyra + name = "republic of elyra sticker sheet" + starts_with = list( + /obj/item/sticker/flagpole/persepolis = 4, + /obj/item/sticker/flagpole/persepolis/aemaq = 2, + /obj/item/sticker/flagpole/persepolis/damascus = 2, + /obj/item/sticker/flagpole/persepolis/medinapole = 2, + /obj/item/sticker/flagpole/persepolis/newsuez = 2 + ) + +/obj/item/storage/stickersheet/sol + name = "solarian alliance sticker sheet" + starts_with = list( + /obj/item/sticker/flagpole/assn = 2, + /obj/item/sticker/flagpole/assn/callisto = 1, + /obj/item/sticker/flagpole/assn/europa = 1, + /obj/item/sticker/flagpole/assn/luna = 1, + /obj/item/sticker/flagpole/assn/mars = 1, + /obj/item/sticker/flagpole/assn/pluto = 1, + /obj/item/sticker/flagpole/assn/venus = 1, + /obj/item/sticker/flagpole/assn/newhaiphong = 1, + /obj/item/sticker/flagpole/assn/sancolette = 1, + /obj/item/sticker/flagpole/assn/silversun = 1, + /obj/item/sticker/flagpole/assn/visegrad = 1 + ) + +/obj/item/storage/stickersheet/coc + name = "coalition of colonies sticker sheet" + starts_with = list( + /obj/item/sticker/flagpole/coalition = 3, + /obj/item/sticker/flagpole/coalition/assunzione = 1, + /obj/item/sticker/flagpole/coalition/burzsiapole = 1, + /obj/item/sticker/flagpole/coalition/gadpathur = 1, + /obj/item/sticker/flagpole/coalition/galatea = 1, + /obj/item/sticker/flagpole/coalition/himeo = 1, + /obj/item/sticker/flagpole/coalition/konyang = 1, + /obj/item/sticker/flagpole/coalition/scarab = 1, + /obj/item/sticker/flagpole/coalition/xanu = 1, + /obj/item/sticker/flagpole/coalition/vysoka = 1 + ) + +/obj/item/storage/stickersheet/dominia + name = "empire of dominia sticker sheet" + starts_with = list( + /obj/item/sticker/flagpole/dominia = 3, + /obj/item/sticker/flagpole/dominia/caladius = 1, + /obj/item/sticker/flagpole/dominia/volvalaad = 1, + /obj/item/sticker/flagpole/dominia/zhao = 1, + /obj/item/sticker/flagpole/dominia/strelitzpole = 1, + /obj/item/sticker/flagpole/dominia/kazhkz = 1, + /obj/item/sticker/flagpole/dominia/hansan = 1, + /obj/item/sticker/flagpole/dominia/frontier = 3 + ) + +/obj/item/storage/stickersheet/nralakk + name = "nralakk federation sticker sheet" + starts_with = list( + /obj/item/sticker/flagpole/nralakk = 3, + /obj/item/sticker/flagpole/nralakk/aweiji = 3, + /obj/item/sticker/flagpole/nralakk/aloise = 3, + /obj/item/sticker/flagpole/nralakk/xrim = 3 + ) + +/obj/item/storage/stickersheet/adhomai + name = "tajaran governments sticker sheet" + starts_with = list( + /obj/item/sticker/flagpole/adhomai = 3, + /obj/item/sticker/flagpole/adhomai/dpra = 3, + /obj/item/sticker/flagpole/adhomai/nka = 3, + /obj/item/sticker/flagpole/adhomai/crevus = 3 + ) + +/obj/item/storage/stickersheet/hieroaetheria + name = "hieroaetheria sticker sheet" + starts_with = list( + /obj/item/sticker/flagpole/hieroaetheria = 4, + /obj/item/sticker/flagpole/hieroaetheria/ekane = 4, + /obj/item/sticker/flagpole/hieroaetheria/glaorr = 4 + ) + +/obj/item/storage/stickersheet/hegemony + name = "uueoa-esa sticker sheet" + starts_with = list( + /obj/item/sticker/flagpole/hegemony = 4, + /obj/item/sticker/flagpole/hegemony/ouerea = 4, + /obj/item/sticker/flagpole/hegemony/queendom = 4 + ) + +/obj/item/storage/stickersheet/resistance + name = "anti-establishment sticker sheet" + starts_with = list( + /obj/item/sticker/flagpole/resistance = 2, + /obj/item/sticker/flagpole/resistance/ftc = 2, + /obj/item/sticker/flagpole/resistance/traverse = 2, + /obj/item/sticker/flagpole/resistance/solkonyang = 2, + /obj/item/sticker/flagpole/resistance/newouerea = 2, + /obj/item/sticker/generic/peace = 2 + ) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/operations.dm b/code/game/objects/structures/crates_lockers/closets/secure/operations.dm index 9328d3fdec0..84f96d3182b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/operations.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/operations.dm @@ -25,7 +25,7 @@ new /obj/item/export_scanner(src) new /obj/item/device/orbital_dropper/drill(src) new /obj/item/device/megaphone/cargo(src) - new /obj/item/storage/box/goldstar(src) + new /obj/item/storage/stickersheet/goldstar(src) new /obj/item/device/flashlight/marshallingwand(src) new /obj/item/gun/energy/disruptorpistol/miniature(src) new /obj/item/clothing/accessory/holster/waist(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 99567361b35..49a313d33ff 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -70,7 +70,7 @@ new /obj/item/device/radio/headset/heads/xo(src) new /obj/item/device/radio/headset/heads/xo/alt(src) new /obj/item/device/megaphone/command(src) - new /obj/item/storage/box/goldstar(src) + new /obj/item/storage/stickersheet/goldstar(src) new /obj/item/gun/energy/repeater/pistol(src) new /obj/item/gun/projectile/sec/flash(src) new /obj/item/device/flash(src) diff --git a/code/modules/cargo/random_stock/t2_uncommon.dm b/code/modules/cargo/random_stock/t2_uncommon.dm index 3fb495bc26e..88e10ea527d 100644 --- a/code/modules/cargo/random_stock/t2_uncommon.dm +++ b/code/modules/cargo/random_stock/t2_uncommon.dm @@ -377,7 +377,7 @@ STOCK_ITEM_UNCOMMON(gumballs, 3) new /obj/item/glass_jar/gumball(L) STOCK_ITEM_UNCOMMON(googly, 0.75) - new /obj/item/storage/box/googly(L) + new /obj/item/storage/stickersheet/googly_eye(L) STOCK_ITEM_UNCOMMON(wizarddressup, 1) new /obj/random/wizard_dressup(L) diff --git a/code/modules/client/preference_setup/loadout/items/toy.dm b/code/modules/client/preference_setup/loadout/items/toy.dm index 27b5154d0c2..fa3b57695bc 100644 --- a/code/modules/client/preference_setup/loadout/items/toy.dm +++ b/code/modules/client/preference_setup/loadout/items/toy.dm @@ -120,3 +120,27 @@ description = "A small, squishy stress ball. This one has a squeaker inside." path = /obj/item/toy/stressball flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + +/datum/gear/toy/stickersheet + display_name = "sticker sheet selection" + description = "A selection of various sticker sheets." + cost = 1 + path = /obj/item/storage/stickersheet + +/datum/gear/toy/stickersheet/New() + ..() + var/list/stickersheet = list() + stickersheet["Generic sticker sheet"] = /obj/item/storage/stickersheet/generic + stickersheet["Religious sticker sheet"] = /obj/item/storage/stickersheet/religion + stickersheet["Domadice sticker sheet"] = /obj/item/storage/stickersheet/domadice + stickersheet["Republic of Biesel sticker sheet"] = /obj/item/storage/stickersheet/biesel + stickersheet["Republic of Elyra sticker sheet"] = /obj/item/storage/stickersheet/elyra + stickersheet["Solarian Alliance sticker sheet"] = /obj/item/storage/stickersheet/sol + stickersheet["Coalition of Colonies sticker sheet"] = /obj/item/storage/stickersheet/coc + stickersheet["Empire of Dominia sticker sheet"] = /obj/item/storage/stickersheet/dominia + stickersheet["Nralakk Federation sticker sheet"] = /obj/item/storage/stickersheet/nralakk + stickersheet["Tajaran Governments sticker sheet"] = /obj/item/storage/stickersheet/adhomai + stickersheet["Hieroaetheria sticker sheet"] = /obj/item/storage/stickersheet/hieroaetheria + stickersheet["Uueoa-Esa sticker sheet"] = /obj/item/storage/stickersheet/hegemony + stickersheet["Anti-Establishment sticker sheet"] = /obj/item/storage/stickersheet/resistance + gear_tweaks += new /datum/gear_tweak/path(stickersheet) diff --git a/html/changelogs/courierbravo-stickers.yml b/html/changelogs/courierbravo-stickers.yml new file mode 100644 index 00000000000..754c55d03c1 --- /dev/null +++ b/html/changelogs/courierbravo-stickers.yml @@ -0,0 +1,61 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: CourierBravo + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a 79 new stickers. Sprites were made by other contributors: 60 by LforLouise, 1 by Noble Row, 2 by Ben10083, 10 by Hazelmouse, 1 by Mr.Popper, 4 by FabianK3, and 1 by Kermit." + - rscadd: "Added a sticker sheet as a new storage, which only accepts stickers. Sprite by Noble Row." + - rscadd: "Added sticker sheets to the loadout menu, under toys." + - rscdel: "Removed the gold star box and googly eye box, replacing them in lockers and on maps with sticker sheets." diff --git a/icons/obj/sticker.dmi b/icons/obj/sticker.dmi index 2a7e210d606ae743bb97a745598b66ed439e64b3..9d9a534a2631c7f8fff76bbe5e2332c98d0ac868 100644 GIT binary patch literal 13421 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 O89ZJ6T-G@yGywqmKgNsz diff --git a/maps/away/ships/scc/scc_scout_ship.dmm b/maps/away/ships/scc/scc_scout_ship.dmm index fb5afc93501..be4cc4cc44d 100644 --- a/maps/away/ships/scc/scc_scout_ship.dmm +++ b/maps/away/ships/scc/scc_scout_ship.dmm @@ -377,7 +377,6 @@ /obj/item/gun/projectile/revolver/detective, /obj/item/ammo_magazine/c38, /obj/item/ammo_magazine/c38/rubber, -/obj/item/storage/box/goldstar, /obj/structure/closet/secure_closet/cabinet{ req_access = list(20) }, @@ -396,6 +395,7 @@ pixel_x = 5; pixel_y = -1 }, +/obj/item/storage/stickersheet/goldstar, /turf/simulated/floor/wood, /area/ship/scc_scout_ship/quarters) "bV" = (