diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 28f5f5c3b0e..6f9bc4c6228 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -21,6 +21,12 @@ icon_state = "tophat" item_state = "that" +/obj/item/clothing/head/canada + name = "striped red tophat" + desc = " It feels sticky, like maple syrup - il se sent collante, comme le sirop d'érable" + icon_state = "canada" + item_state = "canada" + /obj/item/clothing/head/redcoat name = "redcoat's hat" icon_state = "redcoat" diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index 31735f73fbd..689058e6aea 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -621,6 +621,21 @@ icon_state = "male_stripe" gender = MALE +/datum/sprite_accessory/underwear/male_commie + name = "Mens Striped Commie Boxer" + icon_state = "male_commie" + gender = MALE + +/datum/sprite_accessory/underwear/male_uk + name = "Mens Striped UK Boxer" + icon_state = "male_uk" + gender = MALE + +/datum/sprite_accessory/underwear/male_usastripe + name = "Mens Striped Freedom Boxer" + icon_state = "male_assblastusa" + gender = MALE + /datum/sprite_accessory/underwear/male_kinky name = "Mens Kinky" icon_state = "male_kinky" @@ -757,6 +772,11 @@ icon_state = "uk" gender = NEUTER +/datum/sprite_accessory/undershirt/usa + name = "USA Shirt" + icon_state = "shirt_assblastusa" + gender = NEUTER + /datum/sprite_accessory/undershirt/ilovent name = "I Love NT Shirt" icon_state = "ilovent" @@ -1045,6 +1065,36 @@ icon_state = "rainbow_thigh" gender = NEUTER +/datum/sprite_accessory/socks/usa_knee + name = "Knee-High Freedom Stripes" + icon_state = "assblastusa_knee" + gender = NEUTER + +/datum/sprite_accessory/socks/usa_thigh + name = "Thigh-high Freedom Stripes" + icon_state = "assblastusa_thigh" + gender = NEUTER + +/datum/sprite_accessory/socks/uk_knee + name = "Knee-High UK Stripes" + icon_state = "uk_knee" + gender = NEUTER + +/datum/sprite_accessory/socks/uk_thigh + name = "Thigh-high UK Stripes" + icon_state = "uk_thigh" + gender = NEUTER + +/datum/sprite_accessory/socks/commie_knee + name = "Knee-High Commie Stripes" + icon_state = "commie_knee" + gender = NEUTER + +/datum/sprite_accessory/socks/commie_thigh + name = "Thigh-high Commie Stripes" + icon_state = "commie_thigh" + gender = NEUTER + /datum/sprite_accessory/socks/pantyhose name = "Pantyhose" icon_state = "pantyhose" diff --git a/html/changelogs/MMMiracles-assblastusausausa.yml b/html/changelogs/MMMiracles-assblastusausausa.yml new file mode 100644 index 00000000000..3c55863417e --- /dev/null +++ b/html/changelogs/MMMiracles-assblastusausausa.yml @@ -0,0 +1,37 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# spellcheck (typo fixes) +# experiment +# tgs (TG-ported fixes?) +################################# + +# Your name. +author: MMMiracles + +# 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 patriotic underwear apparel due to the most god damn american holiday being just around the corner." + - rscadd: "Also adds some other stuff for those inferior countires too, I guess." diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 934435bd835..2918d313aa8 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/underwear.dmi b/icons/mob/underwear.dmi index 15919bf8ae7..9fa5d35ae04 100644 Binary files a/icons/mob/underwear.dmi and b/icons/mob/underwear.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 59ac6436d18..9bc5f822c87 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ