Merge remote-tracking branch 'origin/master' into luciee

code/modules/food_and_drinks/drinks/drinks.dm

@@ -256,7 +256,10 @@
 /obj/item/reagent_containers/food/drinks/dry_ramen
 	name = "cup ramen"
 	desc = "Just add 5ml of water, self heats! A taste that reminds you of your school years. Now new with salty flavour!"
+	lefthand_file = 'yogstation/icons/mob/inhands/lefthand.dmi'
+	righthand_file = 'yogstation/icons/mob/inhands/righthand.dmi'
 	icon_state = "ramen"
+	item_state = "ramen"
 	list_reagents = list(/datum/reagent/consumable/dry_ramen = 15, /datum/reagent/consumable/sodiumchloride = 3)
 	foodtype = GRAIN
 	isGlass = FALSE

code/modules/food_and_drinks/food/snacks_other.dm

@@ -57,7 +57,10 @@
 /obj/item/reagent_containers/food/snacks/popcorn
 	name = "popcorn"
 	desc = "Now let's find some cinema."
+	lefthand_file = 'yogstation/icons/mob/inhands/lefthand.dmi'
+	righthand_file = 'yogstation/icons/mob/inhands/righthand.dmi'
 	icon_state = "popcorn"
+	item_state = "popcorn"
 	trash = /obj/item/trash/popcorn
 	list_reagents = list(/datum/reagent/consumable/nutriment = 2)
 	bitesize = 0.1 //this snack is supposed to be eating during looooong time. And this it not dinner food! --rastaf0

code/modules/food_and_drinks/food/snacks_vend.dm

@@ -15,8 +15,11 @@
 
 /obj/item/reagent_containers/food/snacks/sosjerky
 	name = "\improper Scaredy's Private Reserve Beef Jerky"
-	icon_state = "sosjerky"
 	desc = "Beef jerky made from the finest space cows."
+	lefthand_file = 'yogstation/icons/mob/inhands/lefthand.dmi'
+	righthand_file = 'yogstation/icons/mob/inhands/righthand.dmi'
+	icon_state = "sosjerky"
+	item_state = "sosjerky"
 	trash = /obj/item/trash/sosjerky
 	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 3, /datum/reagent/consumable/sodiumchloride = 2)
 	junkiness = 25
@@ -33,7 +36,10 @@
 /obj/item/reagent_containers/food/snacks/chips
 	name = "chips"
 	desc = "Commander Riker's What-The-Crisps."
+	lefthand_file = 'yogstation/icons/mob/inhands/lefthand.dmi'
+	righthand_file = 'yogstation/icons/mob/inhands/righthand.dmi'
 	icon_state = "chips"
+	item_state = "chips"
 	trash = /obj/item/trash/chips
 	bitesize = 1
 	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 3, /datum/reagent/consumable/sodiumchloride = 1)
@@ -44,8 +50,11 @@
 
 /obj/item/reagent_containers/food/snacks/no_raisin
 	name = "4no raisins"
-	icon_state = "4no_raisins"
 	desc = "Best raisins in the universe. Not sure why."
+	lefthand_file = 'yogstation/icons/mob/inhands/lefthand.dmi'
+	righthand_file = 'yogstation/icons/mob/inhands/righthand.dmi'
+	icon_state = "4no_raisins"
+	item_state = "4no_raisins"
 	trash = /obj/item/trash/raisins
 	list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/sugar = 4)
 	junkiness = 25
@@ -63,8 +72,11 @@
 
 /obj/item/reagent_containers/food/snacks/spacetwinkie
 	name = "space twinkie"
-	icon_state = "space_twinkie"
 	desc = "Guaranteed to survive longer than you will."
+	lefthand_file = 'yogstation/icons/mob/inhands/lefthand.dmi'
+	righthand_file = 'yogstation/icons/mob/inhands/righthand.dmi'
+	icon_state = "space_twinkie"
+	item_state = "space_twinkie"
 	list_reagents = list(/datum/reagent/consumable/sugar = 4)
 	junkiness = 25
 	filling_color = "#FFD700"
@@ -74,7 +86,10 @@
 /obj/item/reagent_containers/food/snacks/cheesiehonkers
 	name = "cheesie honkers"
 	desc = "Bite sized cheesie snacks that will honk all over your mouth."
+	lefthand_file = 'yogstation/icons/mob/inhands/lefthand.dmi'
+	righthand_file = 'yogstation/icons/mob/inhands/righthand.dmi'
 	icon_state = "cheesie_honkers"
+	item_state = "cheesie_honkers"
 	trash = /obj/item/trash/cheesie
 	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 3)
 	junkiness = 25
@@ -85,8 +100,11 @@
 
 /obj/item/reagent_containers/food/snacks/syndicake
 	name = "syndi-cakes"
-	icon_state = "syndi_cakes"
 	desc = "An extremely moist snack cake that tastes just as good after being nuked."
+	lefthand_file = 'yogstation/icons/mob/inhands/lefthand.dmi'
+	righthand_file = 'yogstation/icons/mob/inhands/righthand.dmi'
+	icon_state = "syndi_cakes"
+	item_state = "syndi_cakes"
 	trash = /obj/item/trash/syndi_cakes
 	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/doctor_delight = 5)
 	filling_color = "#F5F5DC"
@@ -95,8 +113,8 @@
 
 /obj/item/reagent_containers/food/snacks/energybar
 	name = "High-power energy bars"
-	icon_state = "energybar"
 	desc = "An energy bar with a lot of punch, you probably shouldn't eat this if you're not an Ethereal."
+	icon_state = "energybar"
 	trash = /obj/item/trash/energybar
 	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/liquidelectricity = 4)
 	filling_color = "#97ee63"

code/modules/mob/living/carbon/human/species_types/IPC.dm

@@ -176,7 +176,6 @@ datum/species/ipc/on_species_loss(mob/living/carbon/C)
 /datum/species/ipc/spec_revival(mob/living/carbon/human/H, admin_revive)
 	if(admin_revive)
 		return ..()
-	to_chat(H, span_notice("You do not remember your death, how you died, or who killed you. <a href='https://forums.yogstation.net/help/rules/#rule-1_6'>See rule 1.6</a>."))
 	H.Stun(9 SECONDS) // No moving either
 	H.dna.features["ipc_screen"] = "BSOD"
 	H.update_body()

html/changelog.html

@@ -57,6 +57,38 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">26 October 2022</h2>
+			<h3 class="author"> ToasterBiome, Adamsogm, Margot, Cowboy93, BritishGrace updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscdel">Removes 1.6 alert from IPC revival</li>
+			</ul>
+
+			<h2 class="date">25 October 2022</h2>
+			<h3 class="author">KillerOrcaCora updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="imageadd">Our overall in-hand sprite inconsistency is now reduced to 98%! Snacks have in-hand sprites now!</li>
+				<li class="imageadd">Grinder now has caution strips painted on but in reality, they should paint one on you!</li>
+			</ul>
+			<h3 class="author">alexkar598 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscdel">Removes tiktok</li>
+			</ul>
+
+			<h2 class="date">24 October 2022</h2>
+			<h3 class="author">MenacingManatee updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="mapping">Added 2 extra lights to sec hall (Asteroid)</li>
+				<li class="mapping">Added the warden's paystand (Asteroid)</li>
+				<li class="mapping">Removed rwindows from cargo hall (Asteroid)</li>
+				<li class="mapping">Added more firelocks to maint (Asteroid)</li>
+				<li class="mapping">Added flash and intercom to regular cells (Asteroid)</li>
+				<li class="bugfix">Fixed weird firelocks near conference room (Asteroid)</li>
+				<li class="bugfix">Fixed tcomms shutters (Asteroid)</li>
+				<li class="bugfix">Fixed secondary core buttons (Asteroid)</li>
+				<li class="bugfix">Fixed lazy wiring in regular cells (Asteroid)</li>
+				<li class="bugfix">Broken decal in turbine (Asteroid)</li>
+			</ul>
+
 			<h2 class="date">22 October 2022</h2>
 			<h3 class="author"> N3D6, ToasterBiome updated:</h3>
 			<ul class="changes bgimages16">
@@ -2569,38 +2601,6 @@
 			<ul class="changes bgimages16">
 				<li class="tweak">MK IV armor plates are now cheaper</li>
 			</ul>
-
-			<h2 class="date">26 July 2022</h2>
-			<h3 class="author">GraveHat updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Adds Gaxbeacons</li>
-				<li class="rscadd">CMOs get an Intercom now</li>
-				<li class="bugfix">Bots work on Gax</li>
-			</ul>
-			<h3 class="author">TheRyeGuyWhoWillNowDie updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">the cyborg chameleon projector now actually works</li>
-			</ul>
-
-			<h2 class="date">25 July 2022</h2>
-			<h3 class="author">GraveHat updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Adds concussive gauntlets to necropolis chest loot</li>
-				<li class="tweak">increased acid armor to 100</li>
-				<li class="tweak">tweaked to covers arms instead of hands</li>
-				<li class="imageadd">added concussive gauntlets sprites</li>
-			</ul>
-			<h3 class="author">SapphicOverload updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">adds a bunch of new socks and tank tops</li>
-				<li class="bugfix">fixes bee socks not being ordered correctly in the list</li>
-				<li class="bugfix">fixes some inconsistent capitalization</li>
-				<li class="tweak">lets ethereals wear socks and undershirts</li>
-			</ul>
-			<h3 class="author">ynot01 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Helmets with movespeed modifiers now actually adjust your speed</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>

html/changelogs/.all_changelog.yml

@@ -35062,3 +35062,26 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - soundadd: Replaced old axolotl sound with a better one
   ynot01:
   - rscadd: Added image previews to uplink items
+2022-10-24:
+  MenacingManatee:
+  - mapping: Added 2 extra lights to sec hall (Asteroid)
+  - mapping: Added the warden's paystand (Asteroid)
+  - mapping: Removed rwindows from cargo hall (Asteroid)
+  - mapping: Added more firelocks to maint (Asteroid)
+  - mapping: Added flash and intercom to regular cells (Asteroid)
+  - bugfix: Fixed weird firelocks near conference room (Asteroid)
+  - bugfix: Fixed tcomms shutters (Asteroid)
+  - bugfix: Fixed secondary core buttons (Asteroid)
+  - bugfix: Fixed lazy wiring in regular cells (Asteroid)
+  - bugfix: Broken decal in turbine (Asteroid)
+2022-10-25:
+  KillerOrcaCora:
+  - imageadd: Our overall in-hand sprite inconsistency is now reduced to 98%! Snacks
+      have in-hand sprites now!
+  - imageadd: Grinder now has caution strips painted on but in reality, they should
+      paint one on you!
+  alexkar598:
+  - rscdel: Removes tiktok
+2022-10-26:
+  ' ToasterBiome, Adamsogm, Margot, Cowboy93, BritishGrace':
+  - rscdel: Removes 1.6 alert from IPC revival

strings/names/ai.txt

@@ -122,7 +122,6 @@ T-850
 Terminus
 THX 1138
 Tidy
-Tik-Tok
 Tobor
 Trurl
 TWA
@@ -143,4 +142,4 @@ Z-1
 Z-2
 Z-3
 Zed
-Zord
+Zord