Merge branch 'master' into xeno-blood

code/datums/medal_awards.dm

@@ -267,7 +267,7 @@ GLOBAL_LIST_INIT(human_medals, list(MARINE_CONDUCT_MEDAL))
 		return
 
 	if(!((card.paygrade in GLOB.co_paygrades) || (card.paygrade in GLOB.platco_paygrades) || (card.paygrade in GLOB.uscm_highcom_paygrades)))
-		to_chat(user, SPAN_WARNING("Only a Senior Officer can award medals!"))
+		to_chat(user, SPAN_WARNING("Only an Officer can award medals!"))
 		return
 
 	if(!card.registered_ref)
@@ -599,8 +599,8 @@ GLOBAL_DATUM_INIT(ic_medals_panel, /datum/ic_medal_panel, new)
 		to_chat(user, SPAN_WARNING("You must have an authenticated ID Card to award medals."))
 		return
 
-	if(!((card.paygrade in GLOB.co_paygrades) || (card.paygrade in GLOB.uscm_highcom_paygrades)))
-		to_chat(user, SPAN_WARNING("Only a Senior Officer can award medals!"))
+	if(!((card.paygrade in GLOB.co_paygrades) || (card.paygrade in GLOB.platco_paygrades) || (card.paygrade in GLOB.uscm_highcom_paygrades)))
+		to_chat(user, SPAN_WARNING("Only an Officer can award medals!"))
 		return
 
 	if(!card.registered_ref)

code/datums/paygrades/paygrade.dm

@@ -62,7 +62,7 @@ GLOBAL_LIST_INIT(co_paygrades, list(
 				.[pg_id] = new PG
 
 GLOBAL_LIST_INIT(platco_paygrades, list(
-	"MO3",
-	"MO2",
-	"MO1",
+	PAY_SHORT_MO3,
+	PAY_SHORT_MO2,
+	PAY_SHORT_MO1,
 ))

code/datums/weather/weather_event.dm

@@ -11,7 +11,6 @@
 	var/length = 0 // Length of the event
 
 	//// Optional vars
-	var/fullscreen_type = null  // If this is set, display a fullscreen type to mobs
 	var/turf_overlay_icon_state // The icon to set on the VFX holder instanced into every turf at round start
 	var/turf_overlay_alpha = 255
 

code/datums/weather/weather_events/big_red.dm

@@ -2,7 +2,6 @@
 	name = "Duststorm"
 	display_name = "Duststorm"
 	length = 10 MINUTES
-	fullscreen_type = /atom/movable/screen/fullscreen/weather/low
 	turf_overlay_icon_state = "bigred_dust"
 
 	effect_message = "You feel dust blow into every crevice of your body, annoying."
@@ -17,7 +16,6 @@
 	name = "Sandstorm"
 	display_name = "Sandstorm"
 	length = 6 MINUTES
-	fullscreen_type = /atom/movable/screen/fullscreen/weather/medium
 	turf_overlay_icon_state = "bigred_sand"
 
 	effect_message = "You feel sand scraping the upper layers of your exterior away!"
@@ -32,7 +30,6 @@
 	name = "Rockstorm"
 	display_name = "Rockstorm"
 	length = 4 MINUTES
-	fullscreen_type = /atom/movable/screen/fullscreen/weather/high
 	turf_overlay_icon_state = "bigred_rocks"
 
 	effect_message = "You feel multiple small rocks hit all over your body!"

code/datums/weather/weather_events/faction_clash.dm

@@ -2,7 +2,6 @@
 	name = "Rainstorm"
 	display_name = "Rainstorm"
 	length = INFINITY
-	fullscreen_type = /atom/movable/screen/fullscreen/weather/low
 
 	turf_overlay_icon_state = "strata_storm"
 	turf_overlay_alpha = 80

code/datums/weather/weather_events/lv624.dm

@@ -2,7 +2,6 @@
 	name = "Light Rain"
 	display_name = "Light Rain"
 	length = 8 MINUTES
-	fullscreen_type = /atom/movable/screen/fullscreen/weather/low
 
 	turf_overlay_icon_state = "strata_storm"
 	turf_overlay_alpha = 50
@@ -18,7 +17,6 @@
 	name = "Heavy Rain"
 	display_name = "Heavy Rain"
 	length = 12 MINUTES
-	fullscreen_type = /atom/movable/screen/fullscreen/weather/medium
 
 	turf_overlay_icon_state = "strata_storm"
 	turf_overlay_alpha = 125

code/datums/weather/weather_events/new_varadero.dm

@@ -12,7 +12,6 @@
 	name = "Monsoon Warning"
 	display_name = "Monsoon Warning"
 	length = 6 MINUTES
-	fullscreen_type = /atom/movable/screen/fullscreen/weather/high
 
 	turf_overlay_icon_state = "strata_storm"
 	turf_overlay_alpha = 115

code/datums/weather/weather_events/sorokyne.dm

@@ -3,7 +3,6 @@
 	name = "Snow"
 	display_name = "Snow"
 	length = 10 MINUTES
-	fullscreen_type = /atom/movable/screen/fullscreen/weather/low
 	turf_overlay_icon_state = "strata_snowing"
 
 	effect_message = "You feel the icy winds chill you!"
@@ -17,7 +16,6 @@
 	name = "Snowstorm"
 	display_name = "Snowstorm"
 	length = 6 MINUTES
-	fullscreen_type = /atom/movable/screen/fullscreen/weather/medium
 	turf_overlay_icon_state = "strata_storm"
 
 	effect_message = "You feel the icy winds of the snowstorm chill you to the bone!"
@@ -31,7 +29,6 @@
 	name = "Blizzard"
 	display_name = "Blizzard"
 	length = 4 MINUTES
-	fullscreen_type = /atom/movable/screen/fullscreen/weather/high
 	turf_overlay_icon_state = "strata_blizzard"
 
 	effect_message = "You feel the winds of the blizzard sap all the warmth from your body!"

code/game/machinery/vending/vending_types.dm

@@ -200,6 +200,8 @@
 	product_ads = "For the taste that cools your mood, look for the big blue K!;Refined smokers go for Gold!;Lady Fingers are preferred by women who appreciate a cool smoke.;Lady Fingers are the number one cigarette this side of Gateway!;The tobacco connoisseur prefers Koorlander Gold.;For the cool, filtered feel, Lady Finger Cigarettes provide the smoothest draw of any cigarette on the market.;For the man who knows his place is at the top, Koorlander Gold shows the world that you're the best and no-one can say otherwise.;The Colonial Administration Bureau would like to remind you that smoking kills."
 	products = list(
 		/obj/item/storage/fancy/cigarettes/kpack = 20,
+		/obj/item/storage/fancy/cigarettes/spirit = 20,
+		/obj/item/storage/fancy/cigarettes/spirit/yellow = 20,
 		/obj/item/storage/fancy/cigarettes/arcturian_ace = 15,
 		/obj/item/storage/fancy/cigarettes/emeraldgreen = 15,
 		/obj/item/storage/fancy/cigarettes/wypacket = 15,
@@ -216,6 +218,8 @@
 
 	prices = list(
 		/obj/item/storage/fancy/cigarettes/kpack = 40,
+		/obj/item/storage/fancy/cigarettes/spirit = 40,
+		/obj/item/storage/fancy/cigarettes/spirit/yellow = 40,
 		/obj/item/storage/fancy/cigarettes/arcturian_ace = 25,
 		/obj/item/storage/fancy/cigarettes/emeraldgreen = 35,
 		/obj/item/storage/fancy/cigarettes/wypacket = 30,

code/game/objects/items/devices/walkman.dm

@@ -1,8 +1,8 @@
 
 
 /obj/item/device/walkman
-	name = "walkman"
-	desc = "A cassette player that first hit the market over 200 years ago. Crazy how these never went out of style."
+	name = "Seegson C-Series magnetic tape recorder"
+	desc = "A classic-style portable audio recorder used to record or play music and audio tapes. Now when you go EVA you can bring your country jams with you!"
 	icon = 'icons/obj/items/walkman.dmi'
 	icon_state = "walkman"
 	w_class = SIZE_SMALL

code/game/objects/items/storage/fancy.dm

@@ -211,6 +211,19 @@
 	item_state = "lfpacket"
 	default_cig_type = /obj/item/clothing/mask/cigarette/ucigarette
 
+/obj/item/storage/fancy/cigarettes/spirit
+	name = "\improper American Spirit Turquoise Packet"
+	desc = "A pack of turquoise American Spirit cigarettes, for that strong full-bodied flavour you know and love."
+	icon_state = "naspacket"
+	item_state = "naspacket"
+	default_cig_type = /obj/item/clothing/mask/cigarette
+
+/obj/item/storage/fancy/cigarettes/spirit/yellow
+	name = "\improper American Spirit Yellow Packet"
+	desc = "A pack of yellow American Spirit cigarettes, for that mellow flavour you know and love."
+	icon_state = "y_naspacket"
+	item_state = "y_naspacket"
+
 /obj/item/storage/fancy/cigarettes/lucky_strikes_4
 	name = "\improper Lucky Strikes Mini Packet"
 	desc = "These four-packs of Luckies come in every MRE. They're not as good as the Habana Reals that come in the LACN MREs, but at least they're free."

code/game/objects/items/toys/toys.dm

@@ -530,6 +530,31 @@
 	desc = "It says it is a plush on the tag, at least."
 	icon_state = "rock"
 
+/obj/item/toy/plush/otter
+	name = "otter plush"
+	desc = "A perfectly sized snuggable river weasel plush. Keep away from Clams."
+	icon_state = "otter"
+
+/obj/item/toy/plush/fox
+	name = "fox plush"
+	desc = "What does the fox say? Well, this one says nothing on account of it being a stuffed toy."
+	icon_state = "fox"
+
+/obj/item/toy/plush/kitten
+	name = "kitten plush"
+	desc = "A plushie of a cute kitten. Sadly, this one won't purr like the real thing."
+	icon_state = "kbitty"
+
+/obj/item/toy/plush/box
+	name = "box plush"
+	desc = "A toy box plushie, it holds cotton."
+	icon_state = "box"
+
+/obj/item/toy/plush/carp
+	name = "carp plush"
+	desc = "A stuffed toy that resembles a mythological space carp."
+	icon_state = "carp"
+
 /obj/item/toy/plush/therapy
 	name = "therapy plush"
 	desc = "A therapeutic toy to assist marines in recovering from mental and behavioral disorders after experiencing the trauma of battles."
@@ -580,6 +605,11 @@
 		/obj/item/toy/plush/shark,
 		/obj/item/toy/plush/moth,
 		/obj/item/toy/plush/rock,
+		/obj/item/toy/plush/otter,
+		/obj/item/toy/plush/fox,
+		/obj/item/toy/plush/kitten,
+		/obj/item/toy/plush/box,
+		/obj/item/toy/plush/carp,
 	)
 	///Therapy plushies left separately to not flood the entire list
 	var/list/therapy_plush_list = list(

code/modules/client/preferences_gear.dm

@@ -699,6 +699,26 @@ GLOBAL_LIST_EMPTY(gear_datums_by_name)
 	display_name = "Rock plush"
 	path = /obj/item/toy/plush/rock
 
+/datum/gear/plush/otter
+	display_name = "Otter plush"
+	path = /obj/item/toy/plush/otter
+
+/datum/gear/plush/fox
+	display_name = "Fox plush"
+	path = /obj/item/toy/plush/fox
+
+/datum/gear/plush/kitten
+	display_name = "Kitten plush"
+	path = /obj/item/toy/plush/kitten
+
+/datum/gear/plush/box
+	display_name = "Box plush"
+	path = /obj/item/toy/plush/box
+
+/datum/gear/plush/carp
+	display_name = "Carp plush"
+	path = /obj/item/toy/plush/carp
+
 /datum/gear/plush/therapy
 	display_name = "Therapy plush"
 	path = /obj/item/toy/plush/therapy
@@ -1024,6 +1044,7 @@ GLOBAL_LIST_EMPTY(gear_datums_by_name)
 /datum/gear/smoking/pack_lucky_strikes
 	display_name = "Pack Of Lucky Strikes"
 	path = /obj/item/storage/fancy/cigarettes/lucky_strikes
+	cost = 0
 
 /datum/gear/smoking/pack_emeraldgreen
 	display_name = "Pack Of Emerald Greens"
@@ -1055,6 +1076,16 @@ GLOBAL_LIST_EMPTY(gear_datums_by_name)
 	path = /obj/item/storage/fancy/cigarettes/blackpack
 	cost = 4
 
+/datum/gear/smoking/spirit
+	display_name = "Pack Of American Spirit, Turquoise"
+	path = /obj/item/storage/fancy/cigarettes/spirit
+	cost = 4
+
+/datum/gear/smoking/spirit_yellow
+	display_name = "Pack Of American Spirit, Yellow"
+	path = /obj/item/storage/fancy/cigarettes/spirit/yellow
+	cost = 4
+
 /datum/gear/smoking/weed_joint
 	display_name = "Joint of space weed"
 	path = /obj/item/clothing/mask/cigarette/weed

code/modules/clothing/head/helmet.dm

@@ -215,6 +215,8 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
 	/obj/item/storage/fancy/cigarettes/lady_finger = "helmet_cig_lf",
 	/obj/item/storage/fancy/cigarettes/blackpack = "helmet_cig_blackpack",
 	/obj/item/storage/fancy/cigarettes/arcturian_ace = "helmet_cig_aapack",
+	/obj/item/storage/fancy/cigarettes/spirit = "helmet_cig_naspack",
+	/obj/item/storage/fancy/cigarettes/spirit/yellow = "helmet_cig_y_naspack",
 	/obj/item/storage/fancy/cigarettes/lucky_strikes_4 = "hat_cig_ls_mre",
 	/obj/item/storage/fancy/cigar/matchbook = "helmet_matches_mre",
 	/obj/item/clothing/mask/cigarette/cigar = "helmet_cig_cig",

code/modules/gear_presets/other.dm

@@ -751,7 +751,7 @@
 
 /datum/equipment_preset/other/xeno_cultist/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chaplain/cultist(new_human), WEAR_BODY)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp/knife(new_human), WEAR_FEET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(new_human), WEAR_FEET)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack(new_human), WEAR_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(new_human), WEAR_L_STORE)
@@ -794,9 +794,6 @@
 	for(var/action_to_add in actions_to_add)
 		give_action(new_human, action_to_add)
 
-	new_human.default_lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
-	new_human.update_sight()
-
 /datum/equipment_preset/other/xeno_cultist/leader
 	name = "Cultist - Xeno Cultist Leader"
 	uses_special_name = TRUE
@@ -820,6 +817,9 @@
 	for(var/type in types)
 		give_action(new_human, type)
 
+	new_human.default_lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
+	new_human.update_sight()
+
 //*****************************************************************************************************/
 
 /datum/equipment_preset/other/professor_dummy

code/modules/mob/living/living_defense.dm

@@ -212,12 +212,6 @@
 		current_weather_effect_type = SSweather.weather_event_type
 		SSweather.weather_event_instance.process_mob_effect(src, delta_time)
 
-	if(current_weather_effect_type != starting_weather_type)
-		if(current_weather_effect_type)
-			overlay_fullscreen("weather", SSweather.weather_event_instance.fullscreen_type)
-		else
-			clear_fullscreen("weather")
-
 /mob/living/handle_flamer_fire(obj/flamer_fire/fire, damage, delta_time)
 	. = ..()
 	fire.set_on_fire(src)

code/modules/projectiles/ammo_boxes/magazine_boxes.dm

@@ -556,6 +556,7 @@
 
 /obj/item/ammo_box/magazine/mk1
 	name = "magazine box (M41A MK1 x 10)"
+	flags_equip_slot = SLOT_BACK
 	overlay_ammo_type = "_reg_mk1"
 	overlay_gun_type = "_m41"
 	overlay_content = "_reg"
@@ -567,7 +568,6 @@
 
 /obj/item/ammo_box/magazine/mk1/ap
 	name = "magazine box (M41A MK1 AP x 10)"
-	flags_equip_slot = SLOT_BACK
 	overlay_ammo_type = "_ap_mk1"
 	overlay_content = "_ap"
 	magazine_type = /obj/item/ammo_magazine/rifle/m41aMK1/ap
@@ -597,6 +597,7 @@
 
 /obj/item/ammo_box/magazine/nsg23
 	name = "magazine box (NSG 23 x 16)"
+	flags_equip_slot = SLOT_BACK
 	icon_state = "base_nsg23"
 	overlay_gun_type = "_nsg23"
 	overlay_content = "_reg"

html/changelogs/archive/2024-10.yml

@@ -1,3 +1,18 @@
 2024-10-01:
   BonniePandora:
   - bugfix: Un-typos a line of code in the loadout stuff
+2024-10-06:
+  BonniePandora:
+  - qol: Platoon Commanders can once again issue medals to those under their command
+2024-10-07:
+  GriffinMan4455:
+  - qol: Made walkman name and description more lore-ified
+2024-10-08:
+  BonniePandora:
+  - imageadd: Ported giant spider sprites from polaris
+  - imagedel: Axed the old ones present in the .dmi
+  - rscadd: Added new plush toys to the game, along with adding them to the loadout
+      selection list
+  - qol: M41 MK1 and NSG 23 magazine boxes can be carried on the back slot
+  Max-023:
+  - bugfix: Fixes green balaclava sprite