cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +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/modules/background/citizenship/human.dm
+3 -3
View File
@@ -78,9 +78,9 @@
and poor, yet free-willed and provocative Dregs. The Federation is controlled by several megacorporations, and although NanoTrasen is not one of them, it is a common former \
workplace of various contractors on board NSS Aurora."
/datum/citizenship/frontier
name = CITIZENSHIP_FRONTIER
description = "Rising from the former Coalition of Colonies, the Frontier Alliance is a loose confederation of united \"entities\" within the human frontier. These entities range \
/datum/citizenship/coalition
name = CITIZENSHIP_COALITION
description = "The Coalition of Colonies is a loose confederation of united \"entities\" within the human frontier. These entities range \
from whole colonial systems to travelling super ships to mining and farming outposts. Most communities here are, although not as developed as many galactic powers, very \
tightly-knit. Almost anything and anyone can be found in these wild, mostly uncharted lands. "
demonym = "frontiersman"
code/modules/background/defines.dm
+1 -1
View File
@@ -1,7 +1,7 @@
//citizenship defines
#define CITIZENSHIP_BIESEL "Republic of Biesel"
#define CITIZENSHIP_SOL "Sol Alliance"
#define CITIZENSHIP_FRONTIER "Frontier Alliance"
#define CITIZENSHIP_COALITION "Coalition of Colonies"
#define CITIZENSHIP_ELYRA "Republic of Elyra"
#define CITIZENSHIP_ERIDANI "Eridani Federation"
#define CITIZENSHIP_DOMINIA "Empire of Dominia"
code/modules/client/preference_setup/loadout/loadout_accessories.dm
-1
View File
@@ -35,7 +35,6 @@
armbands["engineering armband"] = /obj/item/clothing/accessory/armband/engine
armbands["hydroponics armband"] = /obj/item/clothing/accessory/armband/hydro
armbands["science armband"] = /obj/item/clothing/accessory/armband/science
armbands["ATLAS armband"] = /obj/item/clothing/accessory/armband/atlas
armbands["IAC armband"] = /obj/item/clothing/accessory/armband/iac
gear_tweaks += new/datum/gear_tweak/path(armbands)
code/modules/clothing/spacesuits/rig/suits/combat.dm
+1 -1
View File
@@ -107,7 +107,7 @@
/obj/item/rig/gunslinger
name = "gunslinger hardsuit control module"
desc = "A favorite of Frontier rangers, the Gunslinger suit is a sturdy hardsuit meant to provide the user absolute situational awareness."
desc = "A favorite of Coalition rangers, the Gunslinger suit is a sturdy hardsuit meant to provide the user absolute situational awareness."
icon_state = "gunslinger"
suit_type = "gunslinger hardsuit"
armor = list(melee = 50, bullet = 60, laser = 40, energy = 30, bomb = 30, bio = 100, rad = 60)
code/modules/clothing/spacesuits/rig/suits/light.dm
+1 -1
View File
@@ -190,7 +190,7 @@
/obj/item/rig/light/offworlder/techno
name = "techno-conglomerate mobility hardsuit control module"
desc = "A sleek hardsuit used by the frontier forces of the Techno-Conglomerate."
desc = "A sleek hardsuit used by the Coalition forces of the Techno-Conglomerate."
icon_state = "techno_rig"
suit_type = "techno-conglomerate mobility hardsuit"
armor = list(melee = 40, bullet = 20, laser = 30, energy = 15, bomb = 40, bio = 100, rad = 100)
code/modules/clothing/spacesuits/void/misc.dm
+5 -5
View File
@@ -23,8 +23,8 @@
species_restricted = list("Human")
refittable = FALSE
/obj/item/clothing/head/helmet/space/void/frontier
name = "frontier vulture voidsuit helmet"
/obj/item/clothing/head/helmet/space/void/coalition
name = "coalition vulture voidsuit helmet"
desc = "A helmet resembling an avian, built for the Human head. Heavy and plated with plasteel across its faces."
icon_state = "vulture"
item_state = "vulture"
@@ -35,9 +35,9 @@
brightness_on = 6
refittable = FALSE
/obj/item/clothing/suit/space/void/frontier
name = "frontier vulture voidsuit"
desc = "An iconic Frontier Alliance standard-issue voidsuit, designed after the Interstellar War and seen in use to this day."
/obj/item/clothing/suit/space/void/coalition
name = "coalition vulture voidsuit"
desc = "An iconic Coalition of Colonies standard-issue voidsuit, designed after the Interstellar War and seen in use to this day."
icon_state = "vulture"
item_state = "vulture"
slowdown = 3
code/modules/clothing/suits/miscellaneous.dm
+1 -1
View File
@@ -526,7 +526,7 @@
/obj/item/clothing/suit/varsity
name = "black varsity jacket"
desc = "A favorite of jocks everywhere from Sol to the Frontier."
desc = "A favorite of jocks everywhere from Sol to the Coalition."
icon_state = "varsity"
item_state = "varsity"
allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/device/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask)
code/modules/clothing/under/accessories/armband.dm
-5
View File
@@ -35,11 +35,6 @@
desc = "An armband, worn by the crew to display which department they're assigned to. This one is white and green."
icon_state = "medgreen"
/obj/item/clothing/accessory/armband/atlas
name = "atlas armband"
desc = "This is a armband showing anyone who sees this person, as a member of the political party Atlas. This one is black."
icon_state = "black"
/obj/item/clothing/accessory/armband/iac
name = "interstellar aid corps armband"
desc = "An armband denoting its wearer as a medical worker of the Interstellar Aid Corps. This one is white and blue."
code/modules/customitems/item_defines.dm
+1 -20
View File
@@ -221,15 +221,6 @@ All custom items with worn sprites must follow the contained sprite system: http
species_restricted = list("Unathi")
contained_sprite = TRUE
/obj/item/contraband/poster/fluff/conservan_poster //ATLAS poster - Conservan Xullie - conservatron
name = "ATLAS poster"
/obj/item/contraband/poster/fluff/conservan_poster/New()
..()
serial_number = 59
/obj/item/flame/lighter/zippo/fluff/locke_zippo //Fire Extinguisher Zippo - Jacob Locke - completegarbage
name = "fire extinguisher lighter"
desc = "Most fire extinguishers on the station are way too heavy. This one's a little lighter."
@@ -462,16 +453,6 @@ All custom items with worn sprites must follow the contained sprite system: http
item_state = "sayyidah_dress"
contained_sprite = TRUE
/obj/item/clothing/suit/storage/fluff/vittorio_jacket //Atlas Overcoat - Vittorio Giurifiglio - tytostyris
name = "atlas overcoat"
desc = "A classy black militaristic uniform, which is adorned with a sash and an eagle."
icon = 'icons/obj/custom_items/vittorio_jacket.dmi'
icon_state = "vittorio_jacket"
item_state = "vittorio_jacket"
contained_sprite = TRUE
/obj/item/clothing/suit/storage/toggle/labcoat/fluff/helmut_labcoat //CERN Labcoat - Helmut Kronigernischultz - pyrociraptor
name = "\improper CERN labcoat"
desc = "A Labcoat with a blue pocket and blue collar. On the pocket, you can read \"C.E.R.N.\"."
@@ -3006,7 +2987,7 @@ All custom items with worn sprites must follow the contained sprite system: http
/obj/item/clothing/suit/storage/toggle/det_trench/fluff/takahashi_coat //High Collar Dress Shirt - Shiki Takahashi - nantei
name = "long trenchcoat"
desc = "A very long, black, canvas trench coat. It goes down just below the knees. It looks to be custom-fitted, with a layer of graphene for added armor. There is an infinity \
symbol on the back, similar to the Frontier Alliance flag."
symbol on the back, similar to the Coalition of Colonies flag."
icon = 'icons/obj/custom_items/takahashi_uniform.dmi'
icon_state = "takahashi_coat"
item_state = "takahashi_coat"
code/modules/mob/living/carbon/human/species/species.dm
+1 -1
View File
@@ -212,7 +212,7 @@
var/default_h_style = "Bald"
var/default_f_style = "Shaved"
var/list/allowed_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_SOL, CITIZENSHIP_FRONTIER, CITIZENSHIP_ELYRA, CITIZENSHIP_ERIDANI, CITIZENSHIP_DOMINIA)
var/list/allowed_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_SOL, CITIZENSHIP_COALITION, CITIZENSHIP_ELYRA, CITIZENSHIP_ERIDANI, CITIZENSHIP_DOMINIA)
var/list/allowed_religions = list(RELIGION_NONE, RELIGION_OTHER, RELIGION_CHRISTIANITY, RELIGION_ISLAM, RELIGION_JUDAISM, RELIGION_HINDU, RELIGION_BUDDHISM, RELIGION_MOROZ, RELIGION_TRINARY, RELIGION_SCARAB)
var/default_citizenship = CITIZENSHIP_BIESEL
var/zombie_type //What zombie species they become
code/modules/mob/living/carbon/human/species/station/diona/diona.dm
+1 -1
View File
@@ -93,7 +93,7 @@
max_hydration_factor = -1
allowed_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_JARGON, CITIZENSHIP_SOL, CITIZENSHIP_FRONTIER, CITIZENSHIP_DOMINIA, CITIZENSHIP_IZWESKI, CITIZENSHIP_NONE)
allowed_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_JARGON, CITIZENSHIP_SOL, CITIZENSHIP_COALITION, CITIZENSHIP_DOMINIA, CITIZENSHIP_IZWESKI, CITIZENSHIP_NONE)
allowed_religions = list(RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_MOROZ, RELIGION_THAKH, RELIGION_SKAKH, RELIGION_NONE, RELIGION_OTHER)
/datum/species/diona/handle_sprint_cost(var/mob/living/carbon/H, var/cost)
code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm
+1 -1
View File
@@ -107,7 +107,7 @@
max_hydration_factor = -1
allowed_citizenships = list(CITIZENSHIP_NONE, CITIZENSHIP_BIESEL, CITIZENSHIP_FRONTIER, CITIZENSHIP_ERIDANI)
allowed_citizenships = list(CITIZENSHIP_NONE, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION, CITIZENSHIP_ERIDANI)
default_citizenship = CITIZENSHIP_NONE
// Special snowflake machine vars.
code/modules/mob/living/carbon/human/species/station/skrell/skrell.dm
+1 -1
View File
@@ -54,7 +54,7 @@
default_h_style = "Skrell Short Tentacles"
allowed_citizenships = list(CITIZENSHIP_JARGON, CITIZENSHIP_BIESEL, CITIZENSHIP_SOL, CITIZENSHIP_FRONTIER, CITIZENSHIP_ELYRA, CITIZENSHIP_ERIDANI, CITIZENSHIP_DOMINIA)
allowed_citizenships = list(CITIZENSHIP_JARGON, CITIZENSHIP_BIESEL, CITIZENSHIP_SOL, CITIZENSHIP_COALITION, CITIZENSHIP_ELYRA, CITIZENSHIP_ERIDANI, CITIZENSHIP_DOMINIA)
allowed_religions = list(RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_NONE, RELIGION_OTHER, RELIGION_CHRISTIANITY, RELIGION_ISLAM, RELIGION_MOROZ)
default_citizenship = CITIZENSHIP_JARGON
code/modules/mob/living/carbon/human/species/station/unathi/unathi.dm
+1 -1
View File
@@ -83,7 +83,7 @@
move_trail = /obj/effect/decal/cleanable/blood/tracks/claw
allowed_citizenships = list(CITIZENSHIP_IZWESKI, CITIZENSHIP_DOMINIA, CITIZENSHIP_BIESEL, CITIZENSHIP_SOL, CITIZENSHIP_FRONTIER, CITIZENSHIP_ELYRA, CITIZENSHIP_ERIDANI)
allowed_citizenships = list(CITIZENSHIP_IZWESKI, CITIZENSHIP_DOMINIA, CITIZENSHIP_BIESEL, CITIZENSHIP_SOL, CITIZENSHIP_COALITION, CITIZENSHIP_ELYRA, CITIZENSHIP_ERIDANI)
allowed_religions = list(RELIGION_THAKH, RELIGION_SKAKH, RELIGION_AUTAKH, RELIGION_MOROZ, RELIGION_NONE, RELIGION_OTHER, RELIGION_CHRISTIANITY, RELIGION_ISLAM)
default_citizenship = CITIZENSHIP_IZWESKI