mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-09 16:12:17 +00:00
[MIRROR] only tab indentation (#10517)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
a212c585c7
commit
e501986575
@@ -5,10 +5,11 @@
|
||||
var/directory_erptag
|
||||
var/directory_ad
|
||||
var/vore_prey_eaten = 0
|
||||
//CHOMPEdit additions
|
||||
//CHOMPAdd Start
|
||||
var/vantag_preference = VANTAG_NONE
|
||||
var/directory_gendertag
|
||||
var/directory_sexualitytag
|
||||
//CHOMPAdd End
|
||||
|
||||
/mob/living/mind_initialize()
|
||||
. = ..()
|
||||
@@ -17,7 +18,8 @@
|
||||
mind.directory_tag = client.prefs.directory_tag
|
||||
mind.directory_erptag = client.prefs.directory_erptag
|
||||
mind.directory_ad = client.prefs.directory_ad
|
||||
//CHOMPEdit additions
|
||||
//CHOMPAdd Start
|
||||
mind.vantag_preference = client.prefs.vantag_preference
|
||||
mind.directory_gendertag = client.prefs.directory_gendertag
|
||||
mind.directory_sexualitytag = client.prefs.directory_sexualitytag
|
||||
//CHOMPAdd End
|
||||
|
||||
94
code/modules/lore_codex/lore_data_vr/history.dm
Normal file
94
code/modules/lore_codex/lore_data_vr/history.dm
Normal file
@@ -0,0 +1,94 @@
|
||||
/datum/lore/codex/category/history
|
||||
name = "Human History"
|
||||
data = "The author of this guide wishes to offer their gratitude to NanoTrasen historian, Emir Bodoroczki for his assistance in condensing humanity's history!"
|
||||
children = list(
|
||||
/datum/lore/codex/page/commonwealthbirth,
|
||||
/datum/lore/codex/page/eagerhumanity,
|
||||
/datum/lore/codex/page/hegemonywar,
|
||||
/datum/lore/codex/page/secondawakening
|
||||
)
|
||||
|
||||
/datum/lore/codex/page/commonwealthbirth/add_content()
|
||||
name = "The Birth of the Commonwealth"
|
||||
keywords += list("Sol History","Birth of Commonwealth")
|
||||
data = "In the mid 21st century, the Alden-Sarasprova particle was discovered by the precursor states of the Sol-Proycon Commonwealth. \
|
||||
The European Union and the Moscow-Delhi-Islamabad pact initiated a joint space program to lay the first bricks of our great successes as a nation.\
|
||||
<br><br>\
|
||||
Unfortunately, bluespace travel was beyond our reach - phoron had still been a mystery, its fruits denied to us.\
|
||||
But we were industrious, and began to colonise the gem of Humanity, Sol.\
|
||||
<br><br>\
|
||||
However, even without our stutter drives - we spread. With the aid of genetic engineering, we conquered space.\
|
||||
Despite wars, despite traitors upon Mars who fled to their holdouts in the Ares Confederacy once the speed of light\
|
||||
no longer tethered us - we thrived. By providence, our efforts were rewarded: phoron.\
|
||||
Out in the Oort cloud, beyond our reach if not for our forefather's ambition despite their scarce resources and primitive technology\
|
||||
- phoron awaited us."
|
||||
|
||||
/datum/lore/codex/page/eagerhumanity/add_content()
|
||||
name = "An Eager Humanity"
|
||||
keywords += list("Golden Age")
|
||||
data = "Come the twenty second century, we spread past our blue jewel. Once a mathematical curiosity penned by Lara Alden, \
|
||||
then a confirmed fact by Dmitri Saraspova, and finally - an attainable commodity - we overcame the universal speed limit. \
|
||||
Phoron, laden with bluespace catalysts, had made our dreams reality.\
|
||||
<br><br>\
|
||||
Cygnus, Procyon, Proxima Centauri and many, many more worlds our ancestors had once dreamed of, \
|
||||
and that which had now become little more than a fact of life - had human boots kick up their dust.\
|
||||
We have made first contact - the Skrell. An enigmatic species - but friendly.\
|
||||
Unfortunately, with their technology came discord - their alien ways of life \
|
||||
infecting our impressionable youth out on the frontiers, far from the wisdom of the core.\
|
||||
<br><br> \
|
||||
As wars peppered our history, as have they became a fact of life once more\
|
||||
- rebellious, traitorous movements. World rejecting, foolishly, the yet-infant Commonwealth's protection.\
|
||||
As expected - most failed to maintain their 'self-realisation' - and made amends for their prodigal ways.\
|
||||
<br><br>\
|
||||
All, but those of the Elysian Colonies. Too far from the core, and the core itself was too tumultuous \
|
||||
- they broke away. One needs but look at worlds like Infernum \
|
||||
or the mutt-world of New Eden to realise this was not a victory. \
|
||||
Earth soon united under one banner, an inspiration to all of humanity.\
|
||||
A scarcity of resources necessitates unity. And that unity will bring luxury, rebirth \
|
||||
- one needs only wonder at the natural beauty of our home, the horrors of climate crises \
|
||||
but a distant memory. One needs only look at Mars, and behold its miracle despite Aresian sabotage.\
|
||||
<br><br>\
|
||||
The Commonwealth was now born, proper and true. \
|
||||
It was a prosperous age - with eager trade with our vulpkanin, skrell and tajaran friends."
|
||||
|
||||
/datum/lore/codex/page/hegemonywar/add_content()
|
||||
name = "The Hegemony War"
|
||||
keywords += list("Hegemony War")
|
||||
data = "Unfortunately, not all aliens were eager to trade. Especially not the treacherous Unathi.\
|
||||
Violating all that is just and fair, they conspired to weaken us in what are now the Salthan Fyrds\
|
||||
by sending forth the Rapala. It is commendable how cunning they were - exploiting our mythologies, beliefs and similarities.\
|
||||
<br><br>\
|
||||
We traded, we aided each other. We offered fair compensation for their guidance.\
|
||||
Then - the Unathi came, when we were most vulnerable and demanded the unthinkable\
|
||||
- to surrender our Liberty, our Independence, our Individuality and Equality and become\
|
||||
naught but another cog within their brutish protectorate.\
|
||||
<br><br>\
|
||||
Naturally, we rejected their demands.\
|
||||
<br><br>\
|
||||
Our war was costly - too costly, perhaps - but we persevered as Humanity is wont to do. \
|
||||
Forty years of suffering destroyed much of what we had achieved.\
|
||||
But in that forty years did our megacorporations step forth, offering aid where governments faltered.\
|
||||
Where public science's glacial pace would have cost us lives, forever lost - NanoTrasen's medical research cheated death!\
|
||||
Where Senate-governed mining operations would have wasted precious phoron to corruption \
|
||||
- NanoTrasen stepped up and delivered twice what our armies needed! \
|
||||
<br><br>\
|
||||
Peace soon came - albeit, we had to give up the Fyrds to avoid further loss of life and profit.\
|
||||
Something the short-sighted colonists refused to comply with.\
|
||||
Perhaps - exposure to the treacherous ways of the Hegemony sullied their sense \
|
||||
of honour as well - yet further proof of the dangers distance to \
|
||||
elderly guidance can bring to young worlds. \
|
||||
Although almost a century had passed since peace was signed, \
|
||||
the break-away Fyrders still seek to threaten trade."
|
||||
|
||||
|
||||
/datum/lore/codex/page/secondawakening/add_content()
|
||||
name = "A Second Awakening"
|
||||
keywords += list("Current Era")
|
||||
data = "It is a shame that Unathi could not see the value of free market exchanges. \
|
||||
Not long after the war, such activities revitalised our economy. With this trade came technology.\
|
||||
And with this technology - came you, my dear reader.\
|
||||
<br><br>\
|
||||
Previously denied to us due to the astrogeographical hazards of the Core,\
|
||||
the Coreward Periphery brought humanity many fresh worlds with untapped wells\
|
||||
of purple gold. Whether alien, nomad - whether a Confederate who has seen the light \
|
||||
- NanoTrasen welcomes you in the Virgo-Erigone system."
|
||||
@@ -21,7 +21,8 @@
|
||||
/obj/machinery/giga_drill,
|
||||
/obj/structure/cult/pylon,
|
||||
/obj/machinery/replicator,
|
||||
/obj/structure/crystal)
|
||||
/obj/structure/crystal
|
||||
)
|
||||
|
||||
/obj/machinery/artifact_analyser/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
@@ -105,8 +105,8 @@ fi
|
||||
|
||||
section "code issues"
|
||||
|
||||
part "indentation"
|
||||
echo -e "${RED}DISABLED"
|
||||
#part "indentation"
|
||||
#echo -e "${RED}DISABLED"
|
||||
#Check for weird indentation in any .dm files
|
||||
# awk -f tools/indentation.awk $code_files
|
||||
# retVal=$?
|
||||
@@ -115,6 +115,13 @@ echo -e "${RED}DISABLED"
|
||||
# FAILED=1
|
||||
# fi
|
||||
|
||||
part "mixed tab/space indentation"
|
||||
if grep -P '^\t+ [^ *]' $code_files; then
|
||||
echo
|
||||
echo -e "${RED}ERROR: mixed <tab><space> indentation detected.${NC}"
|
||||
FAILED=1
|
||||
fi;
|
||||
|
||||
part "improperly pathed static lists"
|
||||
if $grep -i 'var/list/static/.*' $code_files; then
|
||||
echo
|
||||
|
||||
Reference in New Issue
Block a user