diff --git a/code/game/objects/items/tools/flame_tools.dm b/code/game/objects/items/tools/flame_tools.dm
index b6f37a00f6d32..c742853c68fdd 100644
--- a/code/game/objects/items/tools/flame_tools.dm
+++ b/code/game/objects/items/tools/flame_tools.dm
@@ -461,7 +461,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	item_state = "pipeoff"
 	icon_on = "pipeon"  //Note - these are in masks.dmi
 	icon_off = "pipeoff"
-	smoketime = 100
+	smoketime = 400
 
 /obj/item/clothing/mask/cigarette/pipe/process()
 	var/turf/location = get_turf(src)
@@ -500,8 +500,22 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	item_state = "cobpipeoff"
 	icon_on = "cobpipeon"  //Note - these are in masks.dmi
 	icon_off = "cobpipeoff"
-	smoketime = 400
 
+/obj/item/clothing/mask/cigarette/pipe/cobpipe/curved
+	name = "curved corn cob pipe"
+	desc = "Usually seen smoked by generals, or mindless bloodlusted commandos... but with style!"
+	icon_state = "curvedcoboff"
+	item_state = "curvedcoboff"
+	icon_on = "curvedcobon"  //Note - these are in masks.dmi
+	icon_off = "curvedcoboff"
+
+/obj/item/clothing/mask/cigarette/pipe/bonepipe
+	name = "Europan bone pipe"
+	desc = "A smoking pipe made out of the bones of the Europan bone whale."
+	icon_state = "bonepipeoff"
+	item_state = "bonepipeoff"
+	icon_on = "bonepipeon"  //Note - these are in masks.dmi
+	icon_off = "bonepipeoff"
 
 
 /////////
diff --git a/code/game/objects/machinery/vending/marine_vending.dm b/code/game/objects/machinery/vending/marine_vending.dm
index b9c608a11e563..b6ecc17cd4b73 100644
--- a/code/game/objects/machinery/vending/marine_vending.dm
+++ b/code/game/objects/machinery/vending/marine_vending.dm
@@ -807,6 +807,7 @@
 			/obj/item/radio/headset/mainship/marine/bravo = -1,
 			/obj/item/radio/headset/mainship/marine/charlie = -1,
 			/obj/item/radio/headset/mainship/marine/delta = -1,
+			/obj/item/toy/plush/pig = 1,
 		),
 		"Mining Equipment" = list(
 			/obj/item/minerupgrade/automatic = 1,
@@ -1303,6 +1304,10 @@
 			/obj/item/clothing/head/squadhb/b = -1,
 			/obj/item/clothing/head/squadhb/c = -1,
 			/obj/item/clothing/head/squadhb/d = -1,
+			/obj/item/clothing/head/tgmcberet/squad = -1,
+			/obj/item/clothing/head/tgmcberet/squad/delta = -1,
+			/obj/item/clothing/head/tgmcberet/squad/alpha = -1,
+			/obj/item/clothing/head/tgmcberet/squad/bravo = -1,
 			/obj/item/clothing/head/slouch = -1,
 			/obj/item/clothing/head/headband/red = -1,
 			/obj/item/clothing/head/headband/rambo = -1,
@@ -1320,6 +1325,7 @@
 			/obj/item/clothing/head/tgmcberet/snow = -1,
 			/obj/item/clothing/head/beret/marine = -1,
 			/obj/item/clothing/head/tgmcberet = -1,
+			/obj/item/clothing/head/tgmcberet/commando = -1,
 			/obj/item/clothing/glasses/mgoggles = -1,
 			/obj/item/clothing/glasses/mgoggles/prescription = -1,
 		),
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index 07777c888d31f..88f1af9ae17db 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -70,6 +70,8 @@
 	new /obj/item/clothing/suit/surgical(src)
 	new /obj/item/clothing/suit/surgical(src)
 	new /obj/item/storage/box/trampop(src)
+	new /obj/item/clothing/head/tgmcberet/medical(src)
+	new /obj/item/clothing/head/tgmcberet/medical(src)
 	if(is_mainship_level(z))
 		new /obj/item/radio/headset/mainship/doc(src)
 
diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm
index a98c2d79d86ac..50011a36c4cb5 100644
--- a/code/modules/client/preferences_gear.dm
+++ b/code/modules/client/preferences_gear.dm
@@ -93,6 +93,35 @@ GLOBAL_LIST_EMPTY(gear_datums)
 	cost = 3
 	slot = SLOT_HEAD
 
+/datum/gear/beret_charlie
+	display_name = "Charlie Squad beret"
+	path = /obj/item/clothing/head/tgmcberet/squad
+	cost = 3
+	slot = SLOT_HEAD
+
+/datum/gear/beret_alpha
+	display_name = "Alpha Squad beret"
+	path = /obj/item/clothing/head/tgmcberet/squad/alpha
+	cost = 3
+	slot = SLOT_HEAD
+
+/datum/gear/beret_delta
+	display_name = "Delta Squad beret"
+	path = /obj/item/clothing/head/tgmcberet/squad/delta
+	cost = 3
+	slot = SLOT_HEAD
+
+/datum/gear/beret_bravo
+	display_name = "Bravo Squad beret"
+	path = /obj/item/clothing/head/tgmcberet/squad/bravo
+	cost = 3
+	slot = SLOT_HEAD
+
+/datum/gear/beret_commando
+	display_name = "Marine Commando beret"
+	path = /obj/item/clothing/head/tgmcberet/commando
+	cost = 3
+	slot = SLOT_HEAD
 
 /datum/gear/headband_green
 	display_name = "TGMC headband (green)"
@@ -194,6 +223,30 @@ GLOBAL_LIST_EMPTY(gear_datums)
 	cost = 2
 	slot = SLOT_WEAR_MASK
 
+/datum/gear/cigarette/pipe
+	display_name = "Smoking pipe"
+	path = /obj/item/clothing/mask/cigarette/pipe
+	cost = 3
+	slot = SLOT_WEAR_MASK
+
+/datum/gear/cigarette/pipe/corn
+	display_name = "Corn cob pipe"
+	path = /obj/item/clothing/mask/cigarette/pipe/cobpipe
+	cost = 3
+	slot = SLOT_WEAR_MASK
+
+/datum/gear/cigarette/pipe/corn/curved
+	display_name = "Curved corn cob pipe"
+	path = /obj/item/clothing/mask/cigarette/pipe/cobpipe/curved
+	cost = 3
+	slot = SLOT_WEAR_MASK
+
+/datum/gear/cigarette/pipe/bone
+	display_name = "Europan bone pipe"
+	path = /obj/item/clothing/mask/cigarette/pipe/bonepipe
+	cost = 3
+	slot = SLOT_WEAR_MASK
+
 /datum/gear/ancient
 	display_name = "Ancient Gasmask"
 	path = /obj/item/clothing/mask/gas/ancient
diff --git a/code/modules/clothing/head/head.dm b/code/modules/clothing/head/head.dm
index 70db7781040c5..bac230a6953e8 100644
--- a/code/modules/clothing/head/head.dm
+++ b/code/modules/clothing/head/head.dm
@@ -154,21 +154,21 @@
 	desc = "The pinnacle of tacticool technology."
 	icon_state = "booniehatdg"
 	item_state = "booniehatdg"
-	soft_armor = list("melee" = 15, "bullet" = 15, "laser" = 15, "energy" = 15, "bomb" = 10, "bio" = 5, "rad" = 0, "fire" = 5, "acid" = 5)
+	soft_armor = list(MELEE = 15, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 10, BIO = 5, FIRE = 5, ACID = 5)
 
 /obj/item/clothing/head/boonie/booniehattan
 	name = "Tan Boonie Hat"
 	desc = "The pinnacle of tacticool technology."
 	icon_state = "booniehattan"
 	item_state = "booniehattan"
-	soft_armor = list("melee" = 15, "bullet" = 15, "laser" = 15, "energy" = 15, "bomb" = 10, "bio" = 5, "rad" = 0, "fire" = 5, "acid" = 5)
+	soft_armor = list(MELEE = 15, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 10, BIO = 5, FIRE = 5, ACID = 5)
 
 /obj/item/clothing/head/slouch
 	name = "\improper TGMC slouch hat"
 	desc = "A nice slouch hat worn by some TGMC troopers while on planets with hot weather, or just for style. While it has limited combat functionality, some prefer to wear it instead of the standard issue helmet."
 	icon_state = "slouch_hat"
 	icon = 'icons/obj/clothing/cm_hats.dmi'
-	soft_armor = list(MELEE = 15, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 10, BIO = 5, FIRE = 5, ACID = 5)
+	soft_armor = list(MELEE = 30, BULLET = 30, LASER = 30, ENERGY = 30, BOMB = 15, BIO = 10, FIRE = 20, ACID = 20)
 
 /obj/item/clothing/head/headband
 	name = "\improper Cyan headband"
@@ -387,27 +387,6 @@
 		slot_r_hand_str = 'icons/mob/items_righthand_1.dmi',)
 	icon = 'icons/obj/clothing/cm_hats.dmi'
 	icon_state = "straw_hat"
-	soft_armor = list(MELEE = 30, BULLET = 30, LASER = 30, ENERGY = 30, BOMB = 15, BIO = 10, "rad" = 0, FIRE = 20, ACID = 20)
+	soft_armor = list(MELEE = 30, BULLET = 30, LASER = 30, ENERGY = 30, BOMB = 15, BIO = 10, FIRE = 20, ACID = 20)
+
 
-/obj/item/clothing/head/squadhb
-	name = "\improper Alpha squad headband"
-	desc = "Headband made from ultra-thin special cloth. Cloth thickness provides more than just a stylish fluttering of headband. You can tie around headband onto a helmet. This squad version of a headband has secret unique features created by the cloth coloring component. "
-	icon = 'icons/obj/clothing/squad_hb.dmi'
-	item_icons = list(
-		slot_head_str = 'icons/mob/squadhb.dmi')
-	icon_state = "asquadhb"
-	soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, "rad" = 0, FIRE = 0, ACID = 0)
-	slowdown = -0.1
-	w_class = WEIGHT_CLASS_TINY
-
-/obj/item/clothing/head/squadhb/b
-	name = "\improper Bravo squad headband"
-	icon_state = "bsquadhb"
-
-/obj/item/clothing/head/squadhb/c
-	name = "\improper Charlie squad headband"
-	icon_state = "csquadhb"
-
-/obj/item/clothing/head/squadhb/d
-	name = "\improper Delta squad headband"
-	icon_state = "dsquadhb"
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/defiler/castedatum_defiler.dm b/code/modules/mob/living/carbon/xenomorph/castes/defiler/castedatum_defiler.dm
index bda1cb32fa6d7..c09dc3fa82353 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/defiler/castedatum_defiler.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/defiler/castedatum_defiler.dm
@@ -34,7 +34,7 @@
 	can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_BE_GIVEN_PLASMA|CASTE_CAN_BE_LEADER|CASTE_CAN_VENT_CRAWL|CASTE_CAN_BECOME_KING
 
 	// *** Defense *** //
-	soft_armor = list(MELEE = 40, BULLET = 40, LASER = 40, ENERGY = 30, BOMB = 20, BIO = 30, "rad" = 30, FIRE = 35, ACID = 30)
+	soft_armor = list(MELEE = 40, BULLET = 40, LASER = 40, ENERGY = 30, BOMB = 20, BIO = 30, FIRE = 35, ACID = 30)
 
 	// *** Minimap Icon *** //
 	minimap_icon = "defiler"
@@ -92,7 +92,7 @@
 	upgrade_threshold = TIER_THREE_MATURE_THRESHOLD
 
 	// *** Defense *** //
-	soft_armor = list(MELEE = 45, BULLET = 45, LASER = 45, ENERGY = 45, BOMB = 20, BIO = 35, "rad" = 35, FIRE = 40, ACID = 35)
+	soft_armor = list(MELEE = 45, BULLET = 45, LASER = 45, ENERGY = 45, BOMB = 20, BIO = 35, FIRE = 40, ACID = 35)
 
 	// *** Pheromones *** //
 	aura_strength = 2 //Defilers aura begins at 1.7 and ends at 2.6. It's .1 better than a carrier at ancient.
@@ -120,7 +120,7 @@
 	upgrade_threshold = TIER_THREE_ELDER_THRESHOLD
 
 	// *** Defense *** //
-	soft_armor = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 30, BIO = 38, "rad" = 38, FIRE = 45, ACID = 38)
+	soft_armor = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 30, BIO = 38, FIRE = 45, ACID = 38)
 
 		// *** Pheromones *** //
 	aura_strength = 2.1 //Defilers aura begins at 1.7 and ends at 2.6. It's .1 better than a carrier at ancient.
@@ -148,7 +148,7 @@
 	upgrade_threshold = TIER_THREE_ANCIENT_THRESHOLD
 
 	// *** Defense *** //
-	soft_armor = list(MELEE = 55, BULLET = 55, LASER = 55, ENERGY = 55, BOMB = 30, BIO = 40, "rad" = 40, FIRE = 50, ACID = 40)
+	soft_armor = list(MELEE = 55, BULLET = 55, LASER = 55, ENERGY = 55, BOMB = 30, BIO = 40, FIRE = 50, ACID = 40)
 
 	// *** Pheromones *** //
 	aura_strength = 2.6 //Defilers aura begins at 1.7 and ends at 2.6. It's .1 better than a carrier at ancient.
@@ -174,7 +174,7 @@
 	max_health = 400
 
 	// *** Defense *** //
-	soft_armor = list(MELEE = 55, BULLET = 55, LASER = 55, ENERGY = 55, BOMB = 30, BIO = 40, "rad" = 40, FIRE = 50, ACID = 40)
+	soft_armor = list(MELEE = 55, BULLET = 55, LASER = 55, ENERGY = 55, BOMB = 30, BIO = 40, FIRE = 50, ACID = 40)
 
 	// *** Pheromones *** //
 	aura_strength = 2.6 //Defilers aura begins at 1.7 and ends at 2.6. It's .1 better than a carrier at ancient.
diff --git a/icons/Marine/gun64.dmi b/icons/Marine/gun64.dmi
index 3b00c6d6b8f6d..4e4e6cda180e8 100644
Binary files a/icons/Marine/gun64.dmi and b/icons/Marine/gun64.dmi differ
diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi
index 77c1f9fbe75de..54798608faea2 100644
Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ
diff --git a/icons/mob/pig_lefthand.dmi b/icons/mob/pig_lefthand.dmi
new file mode 100644
index 0000000000000..b11dc46c83a61
Binary files /dev/null and b/icons/mob/pig_lefthand.dmi differ
diff --git a/icons/mob/pig_righthand.dmi b/icons/mob/pig_righthand.dmi
new file mode 100644
index 0000000000000..e60fcac640d6c
Binary files /dev/null and b/icons/mob/pig_righthand.dmi differ
diff --git a/icons/mob/squadhb.dmi b/icons/mob/squadhb.dmi
index 0576411ba5115..e6cc5a5d2fd74 100644
Binary files a/icons/mob/squadhb.dmi and b/icons/mob/squadhb.dmi differ
diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi
index 9c3ac945ab855..4d403cd4265fd 100644
Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ
diff --git a/icons/obj/clothing/squad_hb.dmi b/icons/obj/clothing/squad_hb.dmi
index 4e2e8c8eb0ab1..4cbed3d6182a6 100644
Binary files a/icons/obj/clothing/squad_hb.dmi and b/icons/obj/clothing/squad_hb.dmi differ
diff --git a/icons/obj/items/ammo.dmi b/icons/obj/items/ammo.dmi
index 567945d406199..5ee21a6433a0c 100644
Binary files a/icons/obj/items/ammo.dmi and b/icons/obj/items/ammo.dmi differ
diff --git a/icons/obj/items/items_mini.dmi b/icons/obj/items/items_mini.dmi
index 104d4f13b1a81..56a767ba51d95 100644
Binary files a/icons/obj/items/items_mini.dmi and b/icons/obj/items/items_mini.dmi differ
diff --git a/icons/obj/items/pig.dmi b/icons/obj/items/pig.dmi
new file mode 100644
index 0000000000000..9225cd85dccfd
Binary files /dev/null and b/icons/obj/items/pig.dmi differ
diff --git a/icons/obj/items/toy.dmi b/icons/obj/items/toy.dmi
index 075b44736d58f..b692eec2c10ff 100644
Binary files a/icons/obj/items/toy.dmi and b/icons/obj/items/toy.dmi differ
diff --git a/sound/items/khryu.ogg b/sound/items/khryu.ogg
new file mode 100644
index 0000000000000..22c507531473f
Binary files /dev/null and b/sound/items/khryu.ogg differ
diff --git a/ss220/code/RU_items.dm b/ss220/code/RU_items.dm
index 2053f7426aadf..21ad506c4841c 100644
--- a/ss220/code/RU_items.dm
+++ b/ss220/code/RU_items.dm
@@ -109,6 +109,7 @@ SUBSYSTEM_DEF(ru_items)
 	default_ammo = /datum/ammo/bullet/revolver/rifle
 	caliber = CALIBER_44LS
 	current_rounds = 40
+	icon_state_mini = "44LSbox"
 	max_rounds = 40
 
 /datum/ammo/bullet/revolver/rifle
@@ -503,3 +504,94 @@ SUBSYSTEM_DEF(ru_items)
 	)
 	cost = 60
 	available_against_xeno_only = TRUE
+
+/obj/item/toy/plush/pig
+	name = "pig toy"
+	desc = "Captain Dementy! Bring the pigs! Marines demand pigs!."
+	icon = 'icons/obj/items/pig.dmi'
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/pig_lefthand.dmi',
+		slot_r_hand_str = 'icons/mob/pig_righthand.dmi',)
+	icon_state = "pig"
+	item_state = "pig"
+	attack_verb = list("oinks", "grunts")
+
+/obj/item/toy/plush/pig/attack_self(mob/user)
+	if(world.time > last_hug_time)
+		user.visible_message(span_notice("[user] presses [src]! Oink! "), \
+							span_notice("You press [src]. Oink! "))
+		last_hug_time = world.time + 50 //5 second cooldown
+
+/obj/item/toy/plush/pig/Initialize()
+	. = ..()
+	AddComponent(/datum/component/squeak, 'sound/items/khryu.ogg', 50)
+
+/datum/supply_packs/supplies/pigs
+	name = "Pig toys crate"
+	contains = list(/obj/item/toy/plush/pig, /obj/item/toy/plush/pig, /obj/item/toy/plush/pig, /obj/item/toy/plush/pig, /obj/item/toy/plush/pig)
+	cost = 50
+	available_against_xeno_only = TRUE
+	containertype = /obj/structure/closet/crate/supply
+
+/obj/item/clothing/head/squadhb
+	name = "\improper Alpha squad headband"
+	desc = "Headband made from ultra-thin special cloth. Cloth thickness provides more than just a stylish fluttering of headband. You can tie around headband onto a helmet. This squad version of a headband has secret unique features created by the cloth coloring component. "
+	icon = 'icons/obj/clothing/squad_hb.dmi'
+	item_icons = list(
+		slot_head_str = 'icons/mob/squadhb.dmi')
+	icon_state = "asquadhb"
+	soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0)
+	slowdown = -0.1
+	w_class = WEIGHT_CLASS_TINY
+
+/obj/item/clothing/head/squadhb/b
+	name = "\improper Bravo squad headband"
+	icon_state = "bsquadhb"
+
+/obj/item/clothing/head/squadhb/c
+	name = "\improper Charlie squad headband"
+	icon_state = "csquadhb"
+
+/obj/item/clothing/head/squadhb/d
+	name = "\improper Delta squad headband"
+	icon_state = "dsquadhb"
+
+/obj/item/clothing/head/tgmcberet/squad
+	name = "\improper Charlie squad beret"
+	icon_state = "csberet"
+	desc = "Military beret with TGMC marine squad insignia. This one belongs to the Charlie Squad."
+	icon = 'icons/obj/clothing/squad_hb.dmi'
+	item_icons = list(
+		slot_head_str = 'icons/mob/squadhb.dmi')
+
+/obj/item/clothing/head/tgmcberet/squad/delta
+	name = "\improper Delta Squad beret"
+	desc = "Military beret with TGMC marine squad insignia. This one belongs to the Delta Squad."
+	icon_state = "dsberet"
+
+/obj/item/clothing/head/tgmcberet/squad/alpha
+	name = "\improper Alpha Squad beret"
+	desc = "Military beret with TGMC marine squad insignia. This one belongs to the Alpha Squad."
+	icon_state = "asberet"
+
+/obj/item/clothing/head/tgmcberet/squad/bravo
+	name = "\improper Bravo Squad beret"
+	desc = "Military beret with TGMC marine squad insignia. This one belongs to the Bravo Squad."
+	icon_state = "bsberet"
+
+/obj/item/clothing/head/tgmcberet/commando
+	name = "\improper Marines Commando beret"
+	desc = "Dark Green beret with an old TGMC insignia on it."
+	icon_state = "marcommandoberet"
+	icon = 'icons/obj/clothing/squad_hb.dmi'
+	item_icons = list(
+		slot_head_str = 'icons/mob/squadhb.dmi')
+
+
+/obj/item/clothing/head/tgmcberet/medical
+	name = "\improper Medical beret"
+	desc = "A white beret with a green cross finely threaded into it. It has that sterile smell about it."
+	icon_state = "medberet"
+	icon = 'icons/obj/clothing/squad_hb.dmi'
+	item_icons = list(
+		slot_head_str = 'icons/mob/squadhb.dmi')
diff --git a/ss220/code/necoarc.dm b/ss220/code/necoarc.dm
index 95b4f44bc8cc6..9a05b478e32fe 100644
--- a/ss220/code/necoarc.dm
+++ b/ss220/code/necoarc.dm
@@ -97,7 +97,7 @@
 	icon_state = "shield-blue"
 	item_icons = "helmetNA"
 	flags_item = NODROP|DELONDROP
-	soft_armor = list("melee" = 65, "bullet" = 60, "laser" = 30, "energy" = 20, "bomb" = 25, "bio" = 40, "rad" = 0, "fire" = 20, "acid" = 20)
+	soft_armor = list(MELEE = 65, BULLET = 60, LASER = 30, ENERGY = 20, BOMB = 25, BIO = 40, FIRE = 20, ACID = 20)
 	anti_hug = 5
 
 //emergency call NecoArc