Merge branch 'shiptest-ss13:master' into 1730

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("<span class='danger'>[L] triggers \the [src].</span>", \
-						"<span class='userdanger'>You trigger \the [src]!</span>")
+				L.visible_message("<span class='danger'>[L] gets caught by \the [src]!</span>", \
+						"<span class='userdanger'>You get caught by \the [src]!</span>")
 				L.apply_damage(trap_damage, BRUTE, def_zone)
 
 /obj/item/restraints/legcuffs/beartrap/energy

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, "<span class='notice'>You combine the eyepatches with a knot.</span>")
-		old_patch.Destroy()
-		Destroy()
+		qdel(old_patch)
+		qdel(src)
+		user.put_in_hands(double_patch)
 
 /obj/item/clothing/glasses/monocle
 	name = "monocle"

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)

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")

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

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

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)
 

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("<span class='danger'>[src] grabs hold of [L]!</span>")
+		visible_message("<span class='danger'>[src] wraps a mass of tentacles around [L]!</span>")
 		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"

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

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

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

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