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

Changes Jargon to Nralakk (#14734)

Browse Source
This commit is contained in:
SleepyGemmy
2022-09-01 21:47:36 +02:00
committed by GitHub
parent 0616bd19ff
commit c1511cbc71
57 changed files with 284 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm
+1 -1
View File
@@ -461,7 +461,7 @@
/decl/reagent/xuxigas
name = "Xu'Xi Gas"
description = "A recreational drug hailing from Qerr'Malic that must be inhaled. It produces a mild high similar to Wulumunusha and is known to make users susceptible to persuasion. Most forms of Xu'Xi Gas found outside of the Jargon Federation are cheap, synthetic substitutes. Only works when inhaled."
description = "A recreational drug hailing from Qerr'Malic that must be inhaled. It produces a mild high similar to Wulumunusha and is known to make users susceptible to persuasion. Most forms of Xu'Xi Gas found outside of the Nralakk Federation are cheap, synthetic substitutes. Only works when inhaled."
color = "#58D373"
taste_description = "algae"
reagent_state = GAS
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+2 -2
View File
@@ -4437,12 +4437,12 @@
name = "The Third Incident"
color = "#1936a0"
strength = 10
description = "A controversial drink popular with the punk youth of the Jargon Federation. Represents blood, eggs, and tears."
description = "A controversial drink popular with the punk youth of the Nralakk Federation. Represents blood, eggs, and tears."
taste_description = "genophage sadness"
glass_icon_state = "thirdincident"
glass_name = "glass of the Third Incident"
glass_desc = "A controversial drink popular with the punk youth of the Jargon Federation. Represents blood, eggs, and tears."
glass_desc = "A controversial drink popular with the punk youth of the Nralakk Federation. Represents blood, eggs, and tears."
/decl/reagent/drink/upsidedowncup
name = "Upside-Down Cup"
code/modules/reagents/reagent_containers/food/snacks.dm
+2 -2
View File
@@ -3927,7 +3927,7 @@
/obj/item/reagent_containers/food/snacks/skrellsnacks
name = "\improper SkrellSnax"
desc = "Cured eki shipped all the way from Jargon 4, almost like jerky! Almost."
desc = "Cured eki shipped all the way from Nralakk IV, almost like jerky! Almost."
icon_state = "skrellsnacks"
trash = /obj/item/trash/skrellsnacks
filling_color = "#A66829"
@@ -4012,7 +4012,7 @@
/obj/item/reagent_containers/food/snacks/neaerakabob
name = "neaera-kabob"
icon_state = "neaera_skewer"
desc = "Neaera meat and organs that have been cooked on a skewer. Typical street vendor food in the Jargon Federation."
desc = "Neaera meat and organs that have been cooked on a skewer. Typical street vendor food in the Nralakk Federation."
trash = /obj/item/stack/rods
reagents_to_add = list(/decl/reagent/nutriment/protein/seafood = 8)
reagent_data = list(/decl/reagent/nutriment/protein/seafood = list("fatty meat" = 2))
code/modules/reagents/reagent_containers/glass/coffeecup.dm
+3 -3
View File
@@ -78,9 +78,9 @@
desc = "A coffee cup bearing the flag of the Izweski Hegemony."
icon_state = "coffeecup_hegemony"
/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/jargon
name = "\improper Jargon coffee cup"
desc = "A purple coffee cup emblazoned with the flag of the Jargon Federation."
/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/nralakk
name = "\improper Nralakk coffee cup"
desc = "A purple coffee cup emblazoned with the flag of the Nralakk Federation."
icon_state = "coffeecup_jarg"
// Organisations