Sprite and Loadout updates [RTM] (#8218)

* Sprite Overhaul (plus some other stuff) * Vending Machine, ciggie, beer, and canister resprites * Revert "Vending Machine, ciggie, beer, and canister resprites" This reverts commit 22aa6f6. * Revert "Revert "Vending Machine, ciggie, beer, and canister resprites"" This reverts commit 18e757b. * firefox appeasement * Update code/modules/reagents/reagent_containers/food/drinks/jar.dm --------- Co-authored-by: hyperioo <[email protected]>
discordia-space · Jun 23, 2023 · 385fd6d · 385fd6d
1 parent 9f29f95
commit 385fd6d
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 34 deletions.
diff --git a/code/datums/autolathe/containers.dm b/code/datums/autolathe/containers.dm
@@ -32,7 +32,7 @@
 
 /datum/design/autolathe/container/jar
 	name = "jar"
-	build_path = /obj/item/reagent_containers/food/drinks/jar
+	build_path = /obj/item/reagent_containers/glass/beaker/jar
 
 /datum/design/autolathe/container/syringe
 	name = "syringe"

diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
@@ -1122,11 +1122,15 @@
 	product_slogans = "Robust Softdrinks: More robust than a toolbox to the head!"
 	product_ads = "Refreshing!;Hope you're thirsty!;Over 1 million drinks sold!;Thirsty? Why not have some cola?;Please, have a drink!;Drink up!;The best drinks in space."
 	products = list(/obj/item/reagent_containers/food/drinks/cans/cola = 10,/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind = 10,
+					/obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind = 4, /obj/item/reagent_containers/food/drinks/bottle/space_up = 4,
+					/obj/item/reagent_containers/food/drinks/bottle/cola = 4,
 					/obj/item/reagent_containers/food/drinks/cans/dr_gibb = 10,/obj/item/reagent_containers/food/drinks/cans/starkist = 10,
 					/obj/item/reagent_containers/food/drinks/cans/waterbottle = 10,/obj/item/reagent_containers/food/drinks/cans/space_up = 10,
 					/obj/item/reagent_containers/food/drinks/cans/iced_tea = 10, /obj/item/reagent_containers/food/drinks/cans/grape_juice = 10)
 	contraband = list(/obj/item/reagent_containers/food/drinks/cans/thirteenloko = 5, /obj/item/reagent_containers/food/snacks/liquidfood = 6)
 	prices = list(/obj/item/reagent_containers/food/drinks/cans/cola = 30,/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind = 30,
+					/obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind = 100, /obj/item/reagent_containers/food/drinks/bottle/space_up = 100,
+					/obj/item/reagent_containers/food/drinks/bottle/cola = 100,
 					/obj/item/reagent_containers/food/drinks/cans/dr_gibb = 30,/obj/item/reagent_containers/food/drinks/cans/starkist = 30,
 					/obj/item/reagent_containers/food/drinks/cans/waterbottle = 32,/obj/item/reagent_containers/food/drinks/cans/space_up = 30,
 					/obj/item/reagent_containers/food/drinks/cans/iced_tea = 30,/obj/item/reagent_containers/food/drinks/cans/grape_juice = 30,
@@ -1488,7 +1492,7 @@
 	name = "prop dispenser"
 	desc = "All the props an actor could need. Probably."
 	icon_state = "Theater"
-	products = list(/obj/structure/flora/pottedplant = 2, /obj/item/device/lighting/toggleable/lamp = 2, /obj/item/device/lighting/toggleable/lamp/green = 2, /obj/item/reagent_containers/food/drinks/jar = 1,
+	products = list(/obj/structure/flora/pottedplant = 2, /obj/item/device/lighting/toggleable/lamp = 2, /obj/item/device/lighting/toggleable/lamp/green = 2, /obj/item/reagent_containers/glass/beaker/jar = 1,
 					/obj/item/toy/cultsword = 4, /obj/item/toy/katana = 2, /obj/item/phone = 3, /obj/item/clothing/head/centhat = 3, /obj/item/clothing/head/richard = 1)
 	auto_price = FALSE
 

diff --git a/code/modules/client/preference_setup/loadout/lists/eyegear.dm b/code/modules/client/preference_setup/loadout/lists/eyegear.dm
@@ -60,10 +60,14 @@
 	display_name = "Sunglasses, prescription"
 	path = /obj/item/clothing/glasses/sunglasses/prescription
 
-
 /datum/gear/eyes/shades/big
 	display_name = "Sunglasses, fat"
 	path = /obj/item/clothing/glasses/sunglasses/big
 	allowed_roles = list("Ironhammer Operative","Ironhammer Commander","Ironhammer Gunnery Sergeant","Captain","First Officer","Ironhammer Inspector","Guild Merchant","Moebius Biolab Officer","Moebius Expedition Overseer","Technomancer Exultant","Club Manager","NeoTheology Preacher")
 
+/datum/gear/eyes/shades/hud
+	display_name = "Sunglasses, HUD"
+	path = /obj/item/clothing/glasses/sunglasses/sechud
+	allowed_roles = list("Ironhammer Operative","Ironhammer Commander","Ironhammer Gunnery Sergeant","Captain","First Officer","Ironhammer Inspector")
+
 
diff --git a/code/modules/organs/body_modifications.dm b/code/modules/organs/body_modifications.dm
@@ -109,7 +109,7 @@ var/global/list/modifications_types = list(
 	name = "Unbranded"
 	id = "prosthesis_basic"
 	desc = "Simple, brutal and reliable prosthesis"
-	body_parts = list(BP_L_ARM, BP_R_ARM, BP_L_LEG, BP_R_LEG)
+	body_parts = list(BP_L_ARM, BP_R_ARM, BP_L_LEG, BP_R_LEG, BP_GROIN, BP_CHEST, BP_HEAD)
 	replace_limb = /obj/item/organ/external/robotic
 	icon = 'icons/mob/human_races/cyberlimbs/generic.dmi'
 	nature = MODIFICATION_SILICON

diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
@@ -283,19 +283,17 @@
 /obj/item/reagent_containers/food/drinks/bottle/melonliquor
 	name = "Emeraldine Melon Liquor"
 	desc = "A bottle of 46 proof Emeraldine Melon Liquor. Sweet and light."
-	icon_state = "alco-green" //Placeholder.
+	icon_state = "emeraldine"
 	center_of_mass = list("x"=16, "y"=6)
 	preloaded_reagents = list("melonliquor" = 100)
-	icon_state_empty = "alco-clear"
 	spawn_tags = SPAWN_TAG_BOOZE
 
 /obj/item/reagent_containers/food/drinks/bottle/bluecuracao
 	name = "Miss Blue Curacao"
 	desc = "A fruity, exceptionally azure drink. Does not allow the imbiber to use the fifth magic."
-	icon_state = "alco-blue" //Placeholder.
+	icon_state = "curacao"
 	center_of_mass = list("x"=16, "y"=6)
 	preloaded_reagents = list("bluecuracao" = 100)
-	icon_state_empty = "alco-clear"
 	spawn_tags = SPAWN_TAG_BOOZE
 
 /obj/item/reagent_containers/food/drinks/bottle/grenadine

diff --git a/code/modules/reagents/reagent_containers/food/drinks/jar.dm b/code/modules/reagents/reagent_containers/food/drinks/jar.dm
@@ -1,20 +1,12 @@
-/obj/item/reagent_containers/food/drinks/jar
-	name = "empty jar"
-	desc = "A jar. You're not sure what it's supposed to hold."
+/obj/item/reagent_containers/glass/beaker/jar
+	name = "jar"
+	desc = "A jar. It holds liquids."
+	icon = 'icons/obj/drinks.dmi'
 	icon_state = "jar"
-	item_state = "beaker"
+	item_state = "jar"
 	center_of_mass = list("x"=15, "y"=8)
 	unacidable = 1
 	spawn_tags = SPAWN_TAG_JUNK
 	matter = list(MATERIAL_GLASS = 2)
 	rarity_value = 20
 
-/obj/item/reagent_containers/food/drinks/jar/on_reagent_change()
-	if (reagents.reagent_list.len > 0)
-		icon_state ="jar_what"
-		name = "jar of something"
-		desc = "You can't really tell what this is."
-	else
-		icon_state = "jar"
-		name = "empty jar"
-		desc = "A jar. You're not sure what it's supposed to hold."
diff --git a/code/modules/reagents/reagents/food-Drinks.dm b/code/modules/reagents/reagents/food-Drinks.dm
@@ -940,7 +940,7 @@
 	color = "#FF004F"
 	taste_tag = list(TASTE_SWEET)
 
-	glass_unique_appearance = TRUE
+	//glass_unique_appearance = TRUE
 	glass_icon_state = "grenadineglass"
 	glass_name = "grenadine syrup"
 	glass_desc = "Sweet and tangy, a bar syrup used to add color or flavor to drinks."
@@ -952,12 +952,12 @@
 	description = "A refreshing beverage."
 	taste_description = "cola"
 	reagent_state = LIQUID
-	color = "#220500"
+	color = "#55433D"
 	adj_drowsy = -3
 	adj_temp = -5
 	taste_tag = list(TASTE_SWEET,TASTE_BUBBLY)
 
-	glass_unique_appearance = TRUE
+	//glass_unique_appearance = TRUE
 	glass_icon_state = "glass_brown"
 	glass_name = "Space Cola"
 	glass_desc = "Ah, refreshing Space Cola!"
@@ -1245,7 +1245,7 @@
 	id = "ale"
 	description = "A dark alcoholic beverage made by malted barley and yeast."
 	taste_description = "hearty barley ale"
-	color = "#664300"
+	color = "#986164"
 	strength = 25
 
 	glass_unique_appearance = TRUE
@@ -1260,11 +1260,11 @@
 	id = "beer"
 	description = "An alcoholic beverage made from malted grains, hops, yeast, and water."
 	taste_description = "piss water"
-	color = "#664300"
+	color = "#BE772B"
 	strength = 35
 	nutriment_factor = 1
 
-	glass_unique_appearance = TRUE
+	//glass_unique_appearance = TRUE
 	glass_icon_state = "beerglass"
 	glass_name = "beer"
 	glass_desc = "A freezing pint of beer"
@@ -1331,7 +1331,7 @@
 	id = "gin"
 	description = "A distilled alcoholic drink that derives its predominant flavour from juniper berries."
 	taste_description = "an alcoholic christmas tree"
-	color = "#664300"
+	color = "#D0DFEC"
 	strength = 25
 	taste_tag = list(TASTE_STRONG,TASTE_DRY)
 
@@ -1394,7 +1394,7 @@
 	description = "Distilled alcoholic drink made from sugarcane byproducts"
 	taste_description = "spiked butterscotch"
 	taste_mult = 1.1
-	color = "#664300"
+	color = "#623434"
 	strength = 15
 
 	glass_unique_appearance = TRUE
@@ -1409,7 +1409,7 @@
 	id = "sake"
 	description = " Alcoholic beverage made by fermenting rice that has been polished."
 	taste_description = "dry alcohol"
-	color = "#664300"
+	color = "#D0DFEC"
 	strength = 25
 
 	glass_unique_appearance = TRUE
@@ -1424,7 +1424,7 @@
 	id = "tequilla"
 	description = "A strong and mildly flavoured, mexican produced spirit."
 	taste_description = "paint stripper"
-	color = "#FFFF91"
+	color = "#D6D9B2"
 	strength = 8
 
 	glass_unique_appearance = TRUE
@@ -1467,7 +1467,7 @@
 	color = "#91FF91" // rgb: 145, 255, 145
 	strength = 15
 
-	glass_unique_appearance = TRUE
+	//glass_unique_appearance = TRUE
 	glass_icon_state = "vermouthglass"
 	glass_name = "vermouth"
 	glass_desc = "You wonder why you're even drinking this straight."
@@ -1479,7 +1479,7 @@
 	id = "vodka"
 	description = "Clear distilled alcoholic beverage that originates from Poland and Russia."
 	taste_description = "grain alcohol"
-	color = "#358adf" // rgb: 0, 100, 200
+	color = "#68BACA" // rgb: 0, 100, 200
 	strength = 5
 
 	glass_unique_appearance = TRUE
@@ -1523,6 +1523,7 @@
 	glass_center_of_mass = list("x"=15, "y"=7)
 	taste_tag = list(TASTE_SWEET, TASTE_BITTER)
 
+
 /datum/reagent/alcohol/ntcahors
 	name = "NeoTheology Cahors Wine"
 	id = "ntcahors"
@@ -1718,7 +1719,7 @@
 	id = "barefoot"
 	description = "Barefoot and pregnant"
 	taste_description = "creamy berries"
-	color = "#664300"
+	color = "#CE93DC"
 	strength = 30
 	sanity_gain_ingest = 0.75
 
@@ -2654,6 +2655,13 @@
 	taste_tag = list(TASTE_SOUR, TASTE_BUBBLY)
 	withdrawal_threshold = 10
 
+	glass_unique_appearance = TRUE
+	glass_icon_state = "roach_beer"
+	glass_name = "Kakerlakenbier"
+	glass_desc = "A green-ish substance made out of diplopterum, beer and fuel mixed with water. Doesn\'t look nor smell like beer..."
+	glass_center_of_mass = list("x"=16, "y"=12)
+
+
 /datum/reagent/alcohol/roachbeer/apply_sanity_effect(mob/living/carbon/human/H, effect_multiplier)
 	if(H.stats.getPerk(PERK_VAGABOND))	// increases sanity_gain to 3 if true
 		effect_multiplier *= 2
@@ -2691,6 +2699,12 @@
 	sanity_gain_ingest = 3
 	taste_tag = list(TASTE_SOUR, TASTE_BUBBLY, TASTE_STRONG)
 
+	glass_unique_appearance = TRUE
+	glass_icon_state = "kaiser_beer"
+	glass_name = "Monarchenblut"
+	glass_desc = "An improvised stimulant made out of Kaiser and Fuhrer roach blood."
+	glass_center_of_mass = list("x"=16, "y"=12)
+
 /datum/reagent/alcohol/kaiserbeer/affect_ingest(mob/living/carbon/M, alien, effect_multiplier) ////// checks user for having a vagabond perk,
 	..()
 	M.stats.addTempStat(STAT_VIG, STAT_LEVEL_EXPERT * effect_multiplier, STIM_TIME, "Monarchenblut")

diff --git a/icons/inventory/face/icon.dmi b/icons/inventory/face/icon.dmi
diff --git a/icons/mob/human_races/cyberlimbs/generic.dmi b/icons/mob/human_races/cyberlimbs/generic.dmi
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi