cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 04:51:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed vars getting set twice in the same class (#19294)

Browse Source 
Fixed vars getting set twice in the same class
This commit is contained in:
Fluffy
2024-06-02 23:13:31 +00:00
committed by GitHub
parent 0dc6f03a46
commit aeb27e21e1
78 changed files with 93 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm
-1
View File
@@ -588,6 +588,5 @@
reagent_state = SOLID
color = "#DCDCDC"
taste_mult = 0 //no taste
fallback_specific_heat = 18
fallback_specific_heat = 0.859
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
-7
View File
@@ -3375,7 +3375,6 @@
taste_description = "orange peel"
color = "#fc782b"
strength = 12
taste_description = "orange peel"
glass_icon_state = "glass_orange"
glass_name = "glass of triple sec"
@@ -5596,7 +5595,6 @@
glass_icon_state = "darmadhirbrew_glass"
glass_name = "glass of Darmadhir Brew"
description = "A rare and expensive brand of nm'shaan liquor."
/singleton/reagent/alcohol/treebark_firewater
name = "Tree-Bark Firewater"
@@ -6044,7 +6042,6 @@
description = "A delicious seasonal flavoring."
color = "#AE771C"
taste_description = "autumn bliss"
condiment_name = "bottle of pumpkin spice"
condiment_name = "Pumpkin Spice"
condiment_desc = "Every teenager's favorite seasonal ingredient."
condiment_icon_state = "pumpkinspice"
@@ -6436,7 +6433,6 @@
glass_icon_state = "pulque_dyn"
glass_name = "dyn pulque"
description = "A traditional Mictlanian drink made from fermented sap of maguey. This one is dyn flavored."
/singleton/reagent/alcohol/pulque/banana
name = "Banana Pulque"
@@ -6446,7 +6442,6 @@
glass_icon_state = "pulque_banana"
glass_name = "banana pulque"
description = "A traditional Mictlanian drink made from fermented sap of maguey. This one is banana flavored."
/singleton/reagent/alcohol/pulque/berry
name = "Berry Pulque"
@@ -6456,7 +6451,6 @@
glass_icon_state = "pulque_berry"
glass_name = "berry pulque"
description = "A traditional Mictlanian drink made from fermented sap of maguey. This one is berry flavored."
/singleton/reagent/alcohol/pulque/coffee
name = "Coffee Pulque"
@@ -6466,7 +6460,6 @@
glass_icon_state = "pulque_coffee"
glass_name = "coffee pulque"
description = "A traditional Mictlanian drink made from fermented sap of maguey. This one is coffee flavored."
/singleton/reagent/drink/jyalra
name = "Jyalra"
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
+1 -2
View File
@@ -384,12 +384,11 @@
color = "#5c4033"
overdose = 10
od_minimum_dose = 2
specific_heat = 1
specific_heat = 1.2
scannable = TRUE
metabolism = REM / 3.33 // 0.06ish units per tick
ingest_met = REM / 1.5 // Should be 0.13 units per tick
breathe_met = REM * 4 // .8 units per tick
specific_heat = 1.2
/singleton/reagent/morphine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder)
var/list/joy_messages = list("You feel soothed and at ease.", "You feel content and at peace.", "You feel a pleasant emptiness.", "You feel like sharing the wonderful memories and feelings you're experiencing.", "All your anxieties fade away.", "You feel like you're floating off the ground.", "You don't want this feeling to end.")
code/modules/reagents/reagent_containers/food/cans.dm
-1
View File
@@ -259,7 +259,6 @@
name = "getmore energy can"
desc = "An extremely ill-advised combination of excessive caffeine and alcohol. Getmore's most controversial product to date!"
icon_state = "thirteen_loko"
icon_state = "thirteen_loko"
center_of_mass = list("x"=16, "y"=10)
reagents_to_add = list(/singleton/reagent/alcohol/thirteenloko = 30)
code/modules/reagents/reagent_containers/food/drinks/bottle.dm
+2 -2
View File
@@ -789,8 +789,8 @@
name = "Boryeong '45 soju"
desc = "A rice-based liquor commonly consumed by the non-synthetic residents of Konyang. This particular brand originates from the city of Boreyeong, on Konyang."
desc_extended = "While most commonly associated with Konyang, soju can be found throughout the Sol Alliance thanks to the inexpensive cost of producing it and a successful \
marketing campaign carried out during the robotics boom on Konyang. It is traditionally consumed neat, or without mixing any other liquids into it. The '45 in this brand's \
name refers to its alcohol by volume content, and not a calendar year."
marketing campaign carried out during the robotics boom on Konyang. It is traditionally consumed neat, or without mixing any other liquids into it. The '45 in this brand's name \
refers to its alcohol by volume content, and not a calendar year."
icon_state = "sojubottle"
center_of_mass = list("x"=16, "y"=4)
reagents_to_add = list(/singleton/reagent/alcohol/soju = 100)
code/modules/reagents/reagent_containers/food/snacks/breads.dm
-1
View File
@@ -289,7 +289,6 @@
center_of_mass = list("x"=16, "y"=10)
reagents_to_add = list(/singleton/reagent/nutriment = 5)
reagent_data = list(/singleton/reagent/nutriment = list("poppy seeds" = 2, "pretzel" = 3))
bitesize = 2
/obj/item/reagent_containers/food/snacks/bagel
name = "bagel"
code/modules/reagents/reagent_containers/food/snacks/confections.dm
-1
View File
@@ -61,7 +61,6 @@
filling_color = "#ffeb94"
reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/nutriment/gelatin = 5)
reagent_data = list(/singleton/reagent/nutriment = list("pineapple sorbet" = 5, "cherry jello" = 5))
trash = /obj/item/trash/snack_bowl
bitesize = 2
/obj/item/reagent_containers/food/snacks/floatingisland/update_icon()
code/modules/reagents/reagent_containers/inhaler.dm
-1
View File
@@ -15,7 +15,6 @@
possible_transfer_amounts = null
atom_flags = ATOM_FLAG_OPEN_CONTAINER
slot_flags = SLOT_BELT
center_of_mass = null
var/name_label
var/spent = FALSE
matter = list(MATERIAL_GLASS = 400, DEFAULT_WALL_MATERIAL = 200)