Changes Jargon to Nralakk (#14734)

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
+12 -12
View File
@@ -162,7 +162,7 @@
switch(selected_world) // If this gets bigger, should probably be a lookup. Switch seems ok for only 11 cases. - lly
if("Nralakk")
hologram_message = pick("You see the Jargon system sky projected on the ceiling.",
hologram_message = pick("You see the Nralakk system sky projected on the ceiling.",
"You see planets slowly orbiting Nralakk above the projector.",
"You hear faint ceremonial hymns.")
if("Qerrbalak")
@@ -187,7 +187,7 @@
"You see large insects hovering above the projector.")
if("the Traverse")
hologram_message = pick("You see an empty, dark hologram that fills the room, scattered with infrequent planets in the distance.",
"A holographic fleet of Jargon's generational ships are emitted from the projector. They pass by, before disappearing into the dark.",
"A holographic fleet of Nralakk's generational ships are emitted from the projector. They pass by, before disappearing into the dark.",
"Atop the projector is displayed a depiction of the crown of the Traverse, Pluat Ven'qop. Qukala ships patrol in circles around it.")
if("Europa")
hologram_message = pick("Upon the walls is projected the window of a submarine, and beyond it a vast, black ocean.",
@@ -220,9 +220,9 @@
apply_world(selected_world)
START_PROCESSING(SSprocessing, src)
/obj/item/jargontag
name = "\improper Jargon Federation loyalty ear-tag"
desc = "An ear-tag that shows the wearer is loyal to the Jargon Federation. A small cable travels into the ear canal..."
/obj/item/nralakktag
name = "\improper Nralakk Federation loyalty ear-tag"
desc = "An ear-tag that shows the wearer is loyal to the Nralakk Federation. A small cable travels into the ear canal..."
w_class = ITEMSIZE_SMALL
slot_flags = SLOT_EARS
icon = 'icons/obj/contained_items/skrell/jargtag.dmi'
@@ -231,7 +231,7 @@
contained_sprite = TRUE
var/fried = FALSE // Doesn't work anymore
/obj/item/jargontag/equipped(mob/living/carbon/human/M)
/obj/item/nralakktag/equipped(mob/living/carbon/human/M)
..()
if(fried)
return
@@ -241,10 +241,10 @@
clamp_on(H)
// Could add some stuff to this in the future? I dunno. I just couldn't figure out how to callback to_chat LOL - geeves
/obj/item/jargontag/proc/do_loyalty(var/mob/wearer)
to_chat(wearer, SPAN_GOOD("You feel an intense feeling of loyalty towards the Jargon Federation surge through your brain."))
/obj/item/nralakktag/proc/do_loyalty(var/mob/wearer)
to_chat(wearer, SPAN_GOOD("You feel an intense feeling of loyalty towards the Nralakk Federation surge through your brain."))
/obj/item/jargontag/proc/clamp_on(var/mob/wearer)
/obj/item/nralakktag/proc/clamp_on(var/mob/wearer)
if(fried)
return
canremove = FALSE
@@ -252,7 +252,7 @@
to_chat(wearer, SPAN_WARNING("\The [src] clamps down around your ear, releasing a burst of static before going silent. Something probes at your ear canal..."))
addtimer(CALLBACK(src, .proc/do_loyalty, wearer), 15)
/obj/item/jargontag/proc/unclamp()
/obj/item/nralakktag/proc/unclamp()
if(fried)
return
if(!canremove)
@@ -261,10 +261,10 @@
canremove = TRUE
fried = TRUE
/obj/item/jargontag/emp_act(severity)
/obj/item/nralakktag/emp_act(severity)
unclamp()
/obj/item/jargontag/emag_act(var/remaining_charges, var/mob/user)
/obj/item/nralakktag/emag_act(var/remaining_charges, var/mob/user)
if(anchored && !canremove)
unclamp()
return TRUE
@@ -138,7 +138,7 @@
..()
randpixel_xy()
var/gift_benefactor = pick("the NanoTrasen Department of Christmas Affairs", "Miranda Trasen", "Joseph Dorne", "Isaac Asimov", "Baal D. Griffon", "the Sol Alliance (Sorry about the blockade!)",
"Hephaestus Industries", "Idris Incorporated", "Glorsh Omega II", "the Jargon Federation", "the People's Republic of Adhomai", "the Adhomai Liberation Army", "the Izweski Hegemony",
"Hephaestus Industries", "Idris Incorporated", "Glorsh Omega II", "the Nralakk Federation", "the People's Republic of Adhomai", "the Adhomai Liberation Army", "the Izweski Hegemony",
"the Zo'ra Hive","the Coalition of Colonies", "Digital Dingo", "Optimum Jeffrey", "Lemmy and the Clockworks", "President Hadii", "King Azunja","Supreme Commander Nated'Hakhan",
"Lord-Regent Not'zar","Jesus Christ","Santa Claus","Mrs. Claus","Sandy Claws","Buddha","Gary","Jesus Christ!","the True Queen of Biesel, God-Lady Seon-rin von Illdenberg, First of Her Name",
"Admiral Frost","Pirate King Frost", "The Secret NanoTrasen Cabal of Duty Officers", "The Society for the Preservation of Rats", "Officer Beepsky","Lieutenant Columbo","Crew of the NSS Upsilon","Runtime",
@@ -581,7 +581,7 @@
/obj/item/storage/box/monkeycubes/neaeracubes
name = "neaera cube box"
desc = "Drymate brand neaera cubes, shipped from Jargon 4. Just add water!"
desc = "Drymate brand neaera cubes, shipped from Nralakk IV. Just add water!"
starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped/neaeracube = 5)
/obj/item/storage/box/monkeycubes/vkrexicubes
+2 -2
View File
@@ -1657,8 +1657,8 @@
/obj/item/flag/hegemony/l,
/obj/item/flag/heph,
/obj/item/flag/heph/l,
/obj/item/flag/jargon,
/obj/item/flag/jargon/l,
/obj/item/flag/nralakk,
/obj/item/flag/nralakk/l,
/obj/item/flag/nanotrasen,
/obj/item/flag/nanotrasen/l,
/obj/item/flag/nka,
+11 -11
View File
@@ -587,24 +587,24 @@
name = "Large Hegemony flag"
flag_size = 1
/obj/structure/sign/flag/jargon
name = "Jargon Federation flag"
desc = "The insignia of the Jargon Federation."
/obj/structure/sign/flag/nralakk
name = "Nralakk Federation flag"
desc = "The insignia of the Nralakk Federation."
icon_state = "jargon"
/obj/structure/sign/flag/jargon/left
/obj/structure/sign/flag/nralakk/left
icon_state = "jargon_l"
/obj/structure/sign/flag/jargon/right
/obj/structure/sign/flag/nralakk/right
icon_state = "jargon_r"
/obj/item/flag/jargon
name = "Jargon Federation flag"
desc = "The insignia of the Jargon Federation."
flag_path = "jargon"
/obj/item/flag/nralakk
name = "Nralakk Federation flag"
desc = "The insignia of the Nralakk Federation."
flag_path = "nralakk"
/obj/item/flag/jargon/l
name = "Large Jargon Federation flag"
/obj/item/flag/nralakk/l
name = "Large Nralakk Federation flag"
flag_size = 1
/obj/structure/sign/flag/traverse