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

Changes Frontier Alliance naming, Removes ATLAS (#7770)

Browse Source
This commit is contained in:
Lady Fowl
2019-12-26 01:15:02 +01:00
committed by Werner
parent cb21d50b78
commit 5343e5ae6f
20 changed files with 83 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/decals/posters/bs12.dm
-5
View File
@@ -289,11 +289,6 @@
name = "space bear information poster"
desc = "This poster displays a picture of a legendary space bear."
/datum/poster/bay_59
icon_state = "bsposter59"
name = "ATLAS poster"
desc = "ATLAS: For all of Humanity."
/datum/poster/bay_60
icon_state = "bsposter60"
name = "N.S.S. Aurora"
code/game/objects/items/weapons/gift_wrappaper.dm
+1 -1
View File
@@ -137,7 +137,7 @@
pixel_y = rand(-10,10)
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",
"the Zo'ra Hive","the Frontier Alliance", "Digital Dingo", "Optimum Jeffrey", "Lemmy and the Clockworks", "President Hadii", "King Azunja","Supreme Commander Nated'Hakhan",
"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",
"Bones","Chauncey","Ian","Pun Pun","Nup Nup","Waldo","Odlaw","Crew of the NSS Exodus", "Custodial Staff of the NTCC Odin","ERT Phoenix","grey slime (357)","Bob the Blob","People for the Ethical Treatment of Bluespace Bears",
code/game/objects/random/random.dm
+2 -2
View File
@@ -422,7 +422,7 @@
/obj/item/clothing/suit/space/void/merc = /obj/item/clothing/head/helmet/space/void/merc,
/obj/item/clothing/suit/space/void/captain = /obj/item/clothing/head/helmet/space/void/captain,
/obj/item/clothing/suit/space/void/cruiser = /obj/item/clothing/head/helmet/space/void/cruiser,
/obj/item/clothing/suit/space/void/frontier = /obj/item/clothing/head/helmet/space/void/frontier,
/obj/item/clothing/suit/space/void/coalition = /obj/item/clothing/head/helmet/space/void/coalition,
/obj/item/clothing/suit/space/void/hos = /obj/item/clothing/head/helmet/space/void/hos,
/obj/item/clothing/suit/space/void/lancer = /obj/item/clothing/head/helmet/space/void/lancer,
/obj/item/clothing/suit/space/void/sci = /obj/item/clothing/head/helmet/space/void/sci,
@@ -438,7 +438,7 @@
/obj/item/clothing/suit/space/void/merc = 0.5,
/obj/item/clothing/suit/space/void/captain = 0.3,
/obj/item/clothing/suit/space/void/cruiser = 0.5,
/obj/item/clothing/suit/space/void/frontier = 1,
/obj/item/clothing/suit/space/void/coalition = 1,
/obj/item/clothing/suit/space/void/hos = 0.3,
/obj/item/clothing/suit/space/void/lancer = 0.3,
/obj/item/clothing/suit/space/void/sci = 2,
code/game/objects/structures/crates_lockers/crates/gear_loadout.dm
+14 -14
View File
@@ -3,18 +3,18 @@
name = "gear crate"
req_access = list(access_syndicate)
/obj/structure/closet/crate/secure/gear_loadout/frontier/fill()
/obj/structure/closet/crate/secure/gear_loadout/coalition/fill()
new /obj/item/rig/gunslinger/equipped(src)
new /obj/item/clothing/head/helmet/space/void/frontier(src)
new /obj/item/clothing/head/helmet/space/void/frontier(src)
new /obj/item/clothing/head/helmet/space/void/frontier(src)
new /obj/item/clothing/head/helmet/space/void/frontier(src)
new /obj/item/clothing/head/helmet/space/void/frontier(src)
new /obj/item/clothing/suit/space/void/frontier(src)
new /obj/item/clothing/suit/space/void/frontier(src)
new /obj/item/clothing/suit/space/void/frontier(src)
new /obj/item/clothing/suit/space/void/frontier(src)
new /obj/item/clothing/suit/space/void/frontier(src)
new /obj/item/clothing/head/helmet/space/void/coalition(src)
new /obj/item/clothing/head/helmet/space/void/coalition(src)
new /obj/item/clothing/head/helmet/space/void/coalition(src)
new /obj/item/clothing/head/helmet/space/void/coalition(src)
new /obj/item/clothing/head/helmet/space/void/coalition(src)
new /obj/item/clothing/suit/space/void/coalition(src)
new /obj/item/clothing/suit/space/void/coalition(src)
new /obj/item/clothing/suit/space/void/coalition(src)
new /obj/item/clothing/suit/space/void/coalition(src)
new /obj/item/clothing/suit/space/void/coalition(src)
new /obj/item/gun/projectile/revolver/mateba(src)
new /obj/item/ammo_magazine/a454(src)
new /obj/item/ammo_magazine/a454(src)
@@ -31,9 +31,9 @@
new /obj/item/ammo_magazine/gauss(src)
new /obj/item/ammo_magazine/gauss/emp(src)
/obj/structure/closet/crate/secure/gear_loadout/frontier_single/fill()
new /obj/item/clothing/head/helmet/space/void/frontier(src)
new /obj/item/clothing/suit/space/void/frontier(src)
/obj/structure/closet/crate/secure/gear_loadout/coalition_single/fill()
new /obj/item/clothing/head/helmet/space/void/coalition(src)
new /obj/item/clothing/suit/space/void/coalition(src)
new /obj/item/gun/projectile/gauss(src)
new /obj/item/ammo_magazine/gauss(src)
new /obj/item/ammo_magazine/gauss(src)