diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm
index 627f3298ccd4..01f147a1b1d0 100644
--- a/code/game/objects/items/handcuffs.dm
+++ b/code/game/objects/items/handcuffs.dm
@@ -217,7 +217,7 @@
desc = "Use this to keep prisoners in line."
gender = PLURAL
icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "handcuff"
+ icon_state = "legcuff"
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
flags_1 = CONDUCT_1
@@ -235,6 +235,17 @@
var/armed = 0
var/trap_damage = 20
+/obj/item/restraints/legcuffs/beartrap/goliath
+ name = "tentacle mass"
+ desc = "Ew."
+ icon_state = "goliathtrap"
+ flags_1 = NONE
+ slowdown = 10
+ breakouttime = 5 SECONDS
+ item_flags = DROPDEL
+ armed = 1
+ trap_damage = 0
+
/obj/item/restraints/legcuffs/beartrap/Initialize()
. = ..()
update_appearance()
@@ -294,8 +305,8 @@
snap = FALSE
if(snap)
close_trap()
- L.visible_message("[L] triggers \the [src].", \
- "You trigger \the [src]!")
+ L.visible_message("[L] gets caught by \the [src]!", \
+ "You get caught by \the [src]!")
L.apply_damage(trap_damage, BRUTE, def_zone)
/obj/item/restraints/legcuffs/beartrap/energy
diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm
index f4c2a5a27f4e..8245a3333e4c 100644
--- a/code/modules/clothing/glasses/_glasses.dm
+++ b/code/modules/clothing/glasses/_glasses.dm
@@ -148,11 +148,11 @@
. = ..()
if(istype(I, /obj/item/clothing/glasses/eyepatch))
var/obj/item/clothing/glasses/eyepatch/old_patch = I
- var/obj/item/clothing/glasses/blindfold/eyepatch/double_patch = new/obj/item/clothing/glasses/blindfold/eyepatch
- double_patch.forceMove(user.drop_location())
+ var/obj/item/clothing/glasses/blindfold/eyepatch/double_patch = new()
to_chat(user, "You combine the eyepatches with a knot.")
- old_patch.Destroy()
- Destroy()
+ qdel(old_patch)
+ qdel(src)
+ user.put_in_hands(double_patch)
/obj/item/clothing/glasses/monocle
name = "monocle"
diff --git a/code/modules/clothing/suits/wintercoats.dm b/code/modules/clothing/suits/wintercoats.dm
index 37b548a0ab72..588a8f1600de 100644
--- a/code/modules/clothing/suits/wintercoats.dm
+++ b/code/modules/clothing/suits/wintercoats.dm
@@ -3,18 +3,28 @@
/obj/item/clothing/suit/hooded/wintercoat
name = "winter coat"
desc = "A heavy jacket made from 'synthetic' animal furs."
+ icon = 'icons/obj/clothing/suits/wintercoat.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/suits/wintercoat.dmi'
icon_state = "coatwinter"
item_state = "coatwinter"
body_parts_covered = CHEST|GROIN|ARMS
cold_protection = CHEST|GROIN|ARMS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
- allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
+ allowed = list( /obj/item/flashlight,
+ /obj/item/tank/internals/emergency_oxygen,
+ /obj/item/tank/internals/plasmaman,
+ /obj/item/toy,
+ /obj/item/storage/fancy/cigarettes,
+ /obj/item/lighter,
+ )
/obj/item/clothing/head/hooded/winterhood
name = "winter hood"
desc = "A hood attached to a heavy winter jacket."
- icon_state = "winterhood"
+ icon = 'icons/obj/clothing/head/winterhood.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/head/winterhood.dmi'
+ icon_state = "hood_winter"
body_parts_covered = HEAD
cold_protection = HEAD
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
@@ -33,7 +43,7 @@
allowed = GLOB.security_wintercoat_allowed
/obj/item/clothing/head/hooded/winterhood/captain
- icon_state = "winterhood_captain"
+ icon_state = "hood_captain"
armor = list("melee" = 25, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 50)
/obj/item/clothing/suit/hooded/wintercoat/security
@@ -48,7 +58,7 @@
allowed = GLOB.security_wintercoat_allowed
/obj/item/clothing/head/hooded/winterhood/security
- icon_state = "winterhood_security"
+ icon_state = "hood_security"
armor = list("melee" = 25, "bullet" = 15, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 45)
/obj/item/clothing/suit/hooded/wintercoat/medical
@@ -60,7 +70,7 @@
hoodtype = /obj/item/clothing/head/hooded/winterhood/medical
/obj/item/clothing/head/hooded/winterhood/medical
- icon_state = "winterhood_medical"
+ icon_state = "hood_medical"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 0, "acid" = 45)
/obj/item/clothing/suit/hooded/wintercoat/medical/paramedic
@@ -70,7 +80,7 @@
hoodtype = /obj/item/clothing/head/hooded/winterhood/medical/paramedic
/obj/item/clothing/head/hooded/winterhood/medical/paramedic
- icon_state = "winterhood_paramedic"
+ icon_state = "hood_paramedic"
/obj/item/clothing/suit/hooded/wintercoat/science
name = "science winter coat"
@@ -81,7 +91,7 @@
hoodtype = /obj/item/clothing/head/hooded/winterhood/science
/obj/item/clothing/head/hooded/winterhood/science
- icon_state = "winterhood_science"
+ icon_state = "hood_science"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
/obj/item/clothing/suit/hooded/wintercoat/engineering
@@ -93,7 +103,7 @@
hoodtype = /obj/item/clothing/head/hooded/winterhood/engineering
/obj/item/clothing/head/hooded/winterhood/engineering
- icon_state = "winterhood_engineer"
+ icon_state = "hood_engineer"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 20, "fire" = 30, "acid" = 45)
/obj/item/clothing/suit/hooded/wintercoat/engineering/atmos
@@ -103,7 +113,7 @@
hoodtype = /obj/item/clothing/head/hooded/winterhood/engineering/atmos
/obj/item/clothing/head/hooded/winterhood/engineering/atmos
- icon_state = "winterhood_atmos"
+ icon_state = "hood_atmos"
/obj/item/clothing/suit/hooded/wintercoat/hydro
name = "hydroponics winter coat"
@@ -113,7 +123,7 @@
hoodtype = /obj/item/clothing/head/hooded/winterhood/hydro
/obj/item/clothing/head/hooded/winterhood/hydro
- icon_state = "winterhood_hydro"
+ icon_state = "hood_hydro"
/obj/item/clothing/suit/hooded/wintercoat/cargo
name = "cargo winter coat"
@@ -122,7 +132,7 @@
hoodtype = /obj/item/clothing/head/hooded/winterhood/cargo
/obj/item/clothing/head/hooded/winterhood/cargo
- icon_state = "winterhood_cargo"
+ icon_state = "hood_cargo"
/obj/item/clothing/suit/hooded/wintercoat/miner
name = "mining winter coat"
@@ -133,7 +143,7 @@
hoodtype = /obj/item/clothing/head/hooded/winterhood/miner
/obj/item/clothing/head/hooded/winterhood/miner
- icon_state = "winterhood_miner"
+ icon_state = "hood_miner"
armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
// Inteq
@@ -147,28 +157,24 @@
supports_variations = KEPORI_VARIATION
/obj/item/clothing/head/hooded/winterhood/security/inteq
- icon_state = "winterhood_inteq"
+ icon_state = "hood_inteq"
supports_variations = KEPORI_VARIATION
-/obj/item/clothing/suit/hooded/coat/inteq
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt
name = "inteq hooded coat"
desc = "A hooded coat with a fur trim around the hood, comfy! It has a small 'IRMG' embroidered onto the shoulder."
- icon_state = "hoodieinteq"
- item_state = "hoodieinteq"
+ icon_state = "coatinteq_alt"
+ item_state = "coatinteq_alt"
armor = list("melee" = 25, "bullet" = 15, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 45)
- hoodtype = /obj/item/clothing/head/hooded/coat/inteq
+ hoodtype = /obj/item/clothing/head/hooded/winterhood/security/inteq/alt
-/obj/item/clothing/head/hooded/coat/inteq
+/obj/item/clothing/head/hooded/winterhood/security/inteq/alt
name = "inteq hood"
desc = "A comfortable looking brown hood."
- icon_state = "hoodinteq"
- item_state = "hoodinteq"
+ icon_state = "hood_inteq_alt"
+ item_state = "hood_inteq_alt"
armor = list("melee" = 25, "bullet" = 15, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 45)
-/obj/item/clothing/suit/hooded/coat/inteq/Initialize()
- . = ..()
- allowed = GLOB.security_wintercoat_allowed
-
// CentCom
/obj/item/clothing/suit/hooded/wintercoat/centcom
name = "centcom winter coat"
@@ -183,7 +189,7 @@
allowed += GLOB.security_wintercoat_allowed
/obj/item/clothing/head/hooded/winterhood/centcom
- icon_state = "winterhood_centcom"
+ icon_state = "hood_centcom"
armor = list("melee" = 35, "bullet" = 40, "laser" = 40, "energy" = 50, "bomb" = 35, "bio" = 10, "rad" = 10, "fire" = 10, "acid" = 60)
// SolGov
@@ -197,5 +203,5 @@
hoodtype = /obj/item/clothing/head/hooded/winterhood/solgov
/obj/item/clothing/head/hooded/winterhood/solgov
- icon_state = "winterhood_solgov"
+ icon_state = "hood_solgov"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 20, "fire" = 30, "acid" = 45)
diff --git a/code/modules/food_and_drinks/food/snacks_frozen.dm b/code/modules/food_and_drinks/food/snacks_frozen.dm
index 95ef84ae5cb7..dfbed9ba9112 100644
--- a/code/modules/food_and_drinks/food/snacks_frozen.dm
+++ b/code/modules/food_and_drinks/food/snacks_frozen.dm
@@ -262,9 +262,9 @@
bonus_reagents = list(/datum/reagent/consumable/hot_coco = 4, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 3, /datum/reagent/consumable/sugar = 2)
overlay_state = "jumbo"
-/obj/item/reagent_containers/food/snacks/popsicle/nogga_black
- name = "nogga black"
- desc = "A salty licorice icecream recently reintroduced due to all the records of the controversy being lost to time. Those who cannot remember the past are doomed to repeat it."
+/obj/item/reagent_containers/food/snacks/popsicle/licorice
+ name = "licorice icecream"
+ desc = "A salty licorice icecream."
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sodiumchloride = 1, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 1, /datum/reagent/consumable/sugar = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sodiumchloride = 1, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 1, /datum/reagent/consumable/sugar = 4)
tastes = list("salty liquorice")
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
index 588eb863fbd7..92647559d9cd 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
@@ -296,8 +296,8 @@
result = /obj/item/reagent_containers/food/snacks/popsicle/jumbo
subcategory = CAT_ICE
-/datum/crafting_recipe/food/nogga_black
- name = "Nogga black"
+/datum/crafting_recipe/food/licorice
+ name = "Licorice icecream"
reqs = list(
/obj/item/popsicle_stick = 1,
/datum/reagent/consumable/blumpkinjuice = 4, //natural source of ammonium chloride
@@ -307,5 +307,5 @@
/datum/reagent/consumable/vanilla = 2,
/datum/reagent/consumable/sugar = 2
)
- result = /obj/item/reagent_containers/food/snacks/popsicle/nogga_black
+ result = /obj/item/reagent_containers/food/snacks/popsicle/licorice
subcategory = CAT_ICE
diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm
index 7d06c9e1f827..a7dc41b307c4 100644
--- a/code/modules/mob/living/carbon/carbon_defines.dm
+++ b/code/modules/mob/living/carbon/carbon_defines.dm
@@ -15,7 +15,7 @@
var/silent = 0 ///Can't talk. Value goes down every life proc. NOTE TO FUTURE CODERS: DO NOT INITIALIZE NUMERICAL VARS AS NULL OR I WILL MURDER YOU.
var/dreaming = 0 ///How many dream images we have left to send
- var/obj/item/handcuffed = null///Whether or not the mob is handcuffed
+ var/obj/item/handcuffed = null ///Whether or not the mob is handcuffed
var/obj/item/legcuffed = null ///Same as handcuffs but for legs. Bear traps use this.
var/disgust = 0
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index d7d6754b0e5d..a0e409c2053d 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -571,7 +571,7 @@ There are several things that need to be remembered:
remove_overlay(LEGCUFF_LAYER)
clear_alert("legcuffed")
if(legcuffed)
- overlays_standing[LEGCUFF_LAYER] = mutable_appearance('icons/mob/mob.dmi', "legcuff1", -LEGCUFF_LAYER)
+ overlays_standing[LEGCUFF_LAYER] = mutable_appearance('icons/mob/mob.dmi', legcuffed.icon_state, -LEGCUFF_LAYER)
apply_overlay(LEGCUFF_LAYER)
throw_alert("legcuffed", /atom/movable/screen/alert/restrained/legcuffed, new_master = src.legcuffed)
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
index 1fa691b85de7..c078196749fc 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
@@ -328,7 +328,7 @@
for(var/mob/living/L in loc)
if((!QDELETED(spawner) && spawner.faction_check_mob(L)) || L.stat == DEAD)
continue
- visible_message("[src] grabs hold of [L]!")
+ visible_message("[src] wraps a mass of tentacles around [L]!")
on_hit(L)
latched = TRUE
if(!latched)
@@ -337,10 +337,11 @@
deltimer(timerid)
timerid = addtimer(CALLBACK(src, PROC_REF(retract)), 10, TIMER_STOPPABLE)
-/obj/effect/temp_visual/goliath_tentacle/proc/on_hit(mob/living/L)
- L.Stun(100)
- L.adjustBruteLoss(rand(10,15))
-
+/obj/effect/temp_visual/goliath_tentacle/proc/on_hit(mob/living/target)
+ target.apply_damage(rand(20,30), BRUTE, pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))
+ if(iscarbon(target))
+ var/obj/item/restraints/legcuffs/beartrap/goliath/B = new /obj/item/restraints/legcuffs/beartrap/goliath(get_turf(target))
+ B.on_entered(src, target)
/obj/effect/temp_visual/goliath_tentacle/proc/retract()
icon_state = "marker"
diff --git a/html/changelogs/AutoChangeLog-pr-2432.yml b/html/changelogs/AutoChangeLog-pr-2432.yml
new file mode 100644
index 000000000000..9b162c910470
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2432.yml
@@ -0,0 +1,5 @@
+author: thgvr
+changes:
+ - {balance: 'Goliaths no longer stun you, instead they apply a bear-trap like mass
+ of tentacles that slows you. Resist to break them off.'}
+delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-2497.yml b/html/changelogs/AutoChangeLog-pr-2497.yml
deleted file mode 100644
index 255f26670649..000000000000
--- a/html/changelogs/AutoChangeLog-pr-2497.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: meemofcourse
-changes:
- - {tweak: The 2nd Battlegroup officer uniform is now the Syndicate Officer uniform}
- - {tweak: The 2nd Battlegroup officer jacket and cap have been updated to reflect
- not being part of the ACLF}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-2499.yml b/html/changelogs/AutoChangeLog-pr-2499.yml
deleted file mode 100644
index 28dd1a453a7f..000000000000
--- a/html/changelogs/AutoChangeLog-pr-2499.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: tmtmtl30
-changes:
- - {bugfix: Ship-spawn unit tests have been fixed and expanded.}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-2505.yml b/html/changelogs/AutoChangeLog-pr-2505.yml
deleted file mode 100644
index 6aae2c118048..000000000000
--- a/html/changelogs/AutoChangeLog-pr-2505.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: PositiveEntropy
-changes:
- - {rscadd: 'The Li-Tieguai is now officially, a Syndicate ship!'}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-2506.yml b/html/changelogs/AutoChangeLog-pr-2506.yml
deleted file mode 100644
index 40bab4822445..000000000000
--- a/html/changelogs/AutoChangeLog-pr-2506.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: FalloutFalcon
-changes:
- - {rscadd: improved radial menu for mining tools}
- - {tweak: menus for removing attachments}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-2535.yml b/html/changelogs/AutoChangeLog-pr-2535.yml
deleted file mode 100644
index 016ae0a166b4..000000000000
--- a/html/changelogs/AutoChangeLog-pr-2535.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: tmtmtl30
-changes:
- - {bugfix: Small playtime-based ship join restriction edge cases fixed.}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-2537.yml b/html/changelogs/AutoChangeLog-pr-2537.yml
deleted file mode 100644
index c90367c4680f..000000000000
--- a/html/changelogs/AutoChangeLog-pr-2537.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: thgvr
-changes:
- - {rscdel: Removes golems}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-2550.yml b/html/changelogs/AutoChangeLog-pr-2550.yml
new file mode 100644
index 000000000000..dbef4f1bca7d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2550.yml
@@ -0,0 +1,4 @@
+author: Halcyon
+changes:
+ - {rscadd: Winter coats have a new coat of paint.}
+delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-2555.yml b/html/changelogs/AutoChangeLog-pr-2555.yml
deleted file mode 100644
index f08dcaf0cb23..000000000000
--- a/html/changelogs/AutoChangeLog-pr-2555.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: tmtmtl30
-changes:
- - {bugfix: fixes planetary outposts from having space underneath all the turfs}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-2576.yml b/html/changelogs/AutoChangeLog-pr-2576.yml
new file mode 100644
index 000000000000..abd7b06d284e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2576.yml
@@ -0,0 +1,5 @@
+author: MarkSuckerberg
+changes:
+ - {tweak: Combining eyepatches should now try to put the result into your hands
+ afterwards}
+delete-after: true
diff --git a/html/changelogs/archive/2023-12.yml b/html/changelogs/archive/2023-12.yml
index eb846dd594cf..6328cce0853b 100644
--- a/html/changelogs/archive/2023-12.yml
+++ b/html/changelogs/archive/2023-12.yml
@@ -17,3 +17,19 @@
- rscadd: Added a LOT of RILENA merch. Plushies, drinks, hoodies, shirts, cosplays...
And if you're a RILENA fan (positive trait), you get a special pin, like the
clown or mime fan!
+2023-12-07:
+ FalloutFalcon:
+ - rscadd: improved radial menu for mining tools
+ - tweak: menus for removing attachments
+ PositiveEntropy:
+ - rscadd: The Li-Tieguai is now officially, a Syndicate ship!
+ meemofcourse:
+ - tweak: The 2nd Battlegroup officer uniform is now the Syndicate Officer uniform
+ - tweak: The 2nd Battlegroup officer jacket and cap have been updated to reflect
+ not being part of the ACLF
+ thgvr:
+ - rscdel: Removes golems
+ tmtmtl30:
+ - bugfix: Small playtime-based ship join restriction edge cases fixed.
+ - bugfix: Ship-spawn unit tests have been fixed and expanded.
+ - bugfix: fixes planetary outposts from having space underneath all the turfs
diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi
index 2ad16e574534..35f629b7c864 100644
Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ
diff --git a/icons/mob/clothing/head/winterhood.dmi b/icons/mob/clothing/head/winterhood.dmi
new file mode 100644
index 000000000000..321896641390
Binary files /dev/null and b/icons/mob/clothing/head/winterhood.dmi differ
diff --git a/icons/mob/clothing/suits/hooded.dmi b/icons/mob/clothing/suits/hooded.dmi
index 71255a115ee0..5988b39e8a6a 100644
Binary files a/icons/mob/clothing/suits/hooded.dmi and b/icons/mob/clothing/suits/hooded.dmi differ
diff --git a/icons/mob/clothing/suits/wintercoat.dmi b/icons/mob/clothing/suits/wintercoat.dmi
new file mode 100644
index 000000000000..4d09ed00a49b
Binary files /dev/null and b/icons/mob/clothing/suits/wintercoat.dmi differ
diff --git a/icons/mob/mob.dmi b/icons/mob/mob.dmi
index 64d0cc4ef8ce..142386586679 100644
Binary files a/icons/mob/mob.dmi and b/icons/mob/mob.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index f9eeb5d1d91d..3a77a2e55885 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/head/winterhood.dmi b/icons/obj/clothing/head/winterhood.dmi
new file mode 100644
index 000000000000..aa212eb48da2
Binary files /dev/null and b/icons/obj/clothing/head/winterhood.dmi differ
diff --git a/icons/obj/clothing/suits/hooded.dmi b/icons/obj/clothing/suits/hooded.dmi
index 120e9443fcb9..366b69d85139 100644
Binary files a/icons/obj/clothing/suits/hooded.dmi and b/icons/obj/clothing/suits/hooded.dmi differ
diff --git a/icons/obj/clothing/suits/wintercoat.dmi b/icons/obj/clothing/suits/wintercoat.dmi
new file mode 100644
index 000000000000..386b905064ae
Binary files /dev/null and b/icons/obj/clothing/suits/wintercoat.dmi differ
diff --git a/icons/obj/food/frozen_treats.dmi b/icons/obj/food/frozen_treats.dmi
index 453bfaf277b7..389949dcfa08 100644
Binary files a/icons/obj/food/frozen_treats.dmi and b/icons/obj/food/frozen_treats.dmi differ
diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi
index 5748d2dec958..7a20a687e055 100644
Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ