diff --git a/code/game/objects/items/sticker.dm b/code/game/objects/items/sticker.dm index 12fadcde205..993e9307714 100644 --- a/code/game/objects/items/sticker.dm +++ b/code/game/objects/items/sticker.dm @@ -121,6 +121,36 @@ desc = "A yellow smiley face. A meme 500 years old, the universal sign for positivity. :)" icon_state = "smile" +/obj/item/sticker/generic/redheart + name = "red heart sticker" + desc = "A red heart outlined in white, ready to declare love, seal secrets, or just make any surface 100% more adorable." + icon_state = "heart-red" + +/obj/item/sticker/generic/smallredheart + name = "small red heart sticker" + desc = "The smaller counterpart to its larger sticker. Perfect for when you want to add a hint of love without overwhelming the room." + icon_state = "smallheart-red" + +/obj/item/sticker/generic/pinkheart + name = "pink heart sticker" + desc = "A pink heart outlined in white, perfect for spreading a little sweetness without saying a word." + icon_state = "heart-pink" + +/obj/item/sticker/generic/smallpinkheart + name = "small pink heart sticker" + desc = "A tiny pink heart sticker, as cute as it is subtle—because who says you can't be sweet without making a big fuss?" + icon_state = "smallheart-pink" + +/obj/item/sticker/generic/blackheart + name = "black heart sticker" + desc = "A black heart sticker, because nothing says 'I'm complicated' like a heart that's too cool for color." + icon_state = "heart-black" + +/obj/item/sticker/generic/smallblackheart + name = "small black heart sticker" + desc = "A tiny black heart sticker, just like yours—dark and a little bit harder to find than you'd like to admit." + icon_state = "smallheart-black" + // //All of the major corporations logos. Unless we add or remove a megacorp, these should remain unchanged. // diff --git a/code/game/objects/items/weapons/storage/stickersheets.dm b/code/game/objects/items/weapons/storage/stickersheets.dm index 407b8bf9524..079c92ad973 100644 --- a/code/game/objects/items/weapons/storage/stickersheets.dm +++ b/code/game/objects/items/weapons/storage/stickersheets.dm @@ -45,6 +45,17 @@ /obj/item/sticker/generic/smile = 2 ) +/obj/item/storage/stickersheet/hearts + name = "heart sticker sheet" + starts_with = list( + /obj/item/sticker/generic/redheart = 2, + /obj/item/sticker/generic/smallredheart = 2, + /obj/item/sticker/generic/pinkheart = 2, + /obj/item/sticker/generic/smallpinkheart = 2, + /obj/item/sticker/generic/blackheart = 2, + /obj/item/sticker/generic/smallblackheart = 2 + ) + /obj/item/storage/stickersheet/religion name = "religious sticker sheet" starts_with = list( diff --git a/code/modules/client/preference_setup/loadout/items/toy.dm b/code/modules/client/preference_setup/loadout/items/toy.dm index 1f008c06985..b348f2c0e62 100644 --- a/code/modules/client/preference_setup/loadout/items/toy.dm +++ b/code/modules/client/preference_setup/loadout/items/toy.dm @@ -131,6 +131,7 @@ ..() var/list/stickersheet = list() stickersheet["Generic sticker sheet"] = /obj/item/storage/stickersheet/generic + stickersheet["Heart sticker sheet"] = /obj/item/storage/stickersheet/hearts 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 diff --git a/html/changelogs/Acetrea-heartstickers.yml b/html/changelogs/Acetrea-heartstickers.yml new file mode 100644 index 00000000000..1d7885df7f1 --- /dev/null +++ b/html/changelogs/Acetrea-heartstickers.yml @@ -0,0 +1,59 @@ +################################ +# 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: Acetrea + +# 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 red heart, small red heart, pink heart, small pink heart, black heart, and small black heart stickers for custom sticker sheets." + - rscadd: "Added a heart sticker sheet option that contains 2 of each 6 heart sticker." diff --git a/icons/obj/sticker.dmi b/icons/obj/sticker.dmi index 9d9a534a263..bafdb9a641c 100644 Binary files a/icons/obj/sticker.dmi and b/icons/obj/sticker.dmi differ