Guti
f4f5476121
Merge branch 'master' into weapon-removal
2024-09-18 18:07:43 +02:00
Kashargul
8a90ae6523
only missing alt titles
2024-09-12 22:48:14 +02:00
Kashargul
4ba7beeb9c
up to field medic
2024-09-12 21:20:47 +02:00
Kashargul
8a3520e2e0
move all factions to defines
2024-09-12 20:17:41 +02:00
Kashargul
10dc8510b3
up to engineer
2024-09-12 02:01:36 +02:00
Kashargul
0425a4e396
up to officer
2024-09-12 00:00:11 +02:00
Guti
409aaba802
Remove
2024-09-09 02:36:53 +02:00
Heroman3003
7f68155411
Reduces amount of drone racism ( #15968 )
2024-05-06 16:25:03 +10:00
Drathek
7c8bb85de3
Whitespace Standardization [MDB IGNORE] ( #15748 )
...
* Update settings
* Whitespace changes
* Comment out merger hooks in gitattributes
Corrupt maps would have to be resolved in repo before hooks could be updated
* Revert "Whitespace changes"
This reverts commit afbdd1d844de22ad375d
2024-02-20 11:28:51 +01:00
Nadyr
9347a99f5b
Ports QoL, upgrades, and a lot of bug fixes
2024-01-18 21:04:36 -05:00
Selis
271ff9408f
Spell Fixes
2023-06-18 12:47:36 +02:00
Cerebulon
19715ab471
/tg/ era language pass
2023-02-25 02:34:24 -05:00
Heroman
4bbf9efacb
Some runtime fixes + oldchat icons
2022-12-18 06:40:13 +10:00
Runa Dacino
36169e7aa0
Adds "History" section to Traveller's Guide
...
Adds History per Loremaster-Hangout discussion (approved by Dragor). This is a highly condensed, biased perspective on History, written with heavy help from NanoTrasen by hands of a naive exploring resomi.
Also fixed mentions to Vir to Virgo-Erigone where it was obvious.
Fixed an instance of time travel.
Removed sneaky mention of SolGov that slipped my eyes.
Fixes some capitalisation issues.
2022-12-11 18:44:18 +01:00
Runa Dacino
73e104bc74
Updates Traveller's Guide with new species lore
...
Replaces blurbs with cataloguer information when able.
Otherwise, using wikipedia blurbs.
Added Rapala and Altevians and Drones and Cyborgs.
Edited positronic lifespan to follow Synthetic lore on wiki
Wrote custom text for drones and cyborgs, in spirit of the Synthetic Page.
Deleted ancient "TODO" commented out lore as that will never be relevant again. We'll just use the wiki where needed.
Government, locations etc untouched for now. They're on the TODO list.
Also TODO: potentially edit language so it is consistent across blurbs.
Also added an OOC note on the main page to warn that this book contains IC bias, and to consult the wikipedia's backstory entry for objective lore.
2022-12-04 17:31:15 +01:00
C.L
3801bf0e4b
Update main.dm
2022-10-01 20:24:14 -04:00
Atermonera
0f563c7dd7
Post-Timeskip News Update
2022-10-01 14:18:08 -04:00
Casey
0703cd8204
Merge pull request #13539 from Runa-Dacino/prosthetic-lore-edit
...
Changes mentions of "First Contact War" with "Hegemony War"
2022-08-21 15:38:58 -04:00
Runa Dacino
5a1990d372
Changes Hephaestus lore entry to "Hegemony War" from "First Contact"
2022-08-20 15:14:10 +02:00
Runa Dacino
79129773b6
Fixes date from 2542 to 2302 in lorebook
2022-08-20 13:12:50 +02:00
MistakeNot4892
9f4f996b19
Merge pull request #8209 from Cerebulon/news_popup
...
Prevents Pop-up for Already Seen Lore News
2021-08-25 22:34:44 -04:00
Cerebulon
382cbd4a93
News Update + Communicator Lag Fix ( #7973 )
...
* News Update + Communicator Lag Fix
* combined if. please merge this has been up way too long
2021-03-21 17:13:24 -04:00
Cerebulon
0665d37c78
Lobby Improvements
2021-02-21 16:33:23 -05:00
Cerebulon
4fc2884f9f
Excised Errant Bay Military Lore ( #7810 )
...
* Filth + Graffiti Fixes
* Excised Bad Lore
* Update filth.dm
why was this here oops i was on master
2021-01-01 00:40:56 -05:00
Atermonera
1266d146b1
Merge pull request #7483 from Cerebulon/newsAug2020
...
News update... April-May 2020
2020-08-15 23:51:52 -04:00
Schnayy
99a977ee3d
Merge pull request #6799 from Cerebulon/booksprites
...
New book sprites + inhands
2020-07-09 17:33:58 -04:00
Killian
bd50595244
improved traffic, take two
2020-06-10 22:26:23 +01:00
Novacat
4c7db1fc2d
Update codex.dm
2020-03-15 14:45:18 -04:00
Atermonera
8d2b41ad2c
Big Bastard Incidental Sound Port
2020-03-15 14:39:19 -04:00
Atermonera
6bcb84b44a
Merge pull request #6796 from Cerebulon/newsUpdatemar2020
...
Oct-Feb News Update
2020-03-10 03:37:49 -04:00
Unknown
7931795ddd
Compatability, Re-enables old library
2019-11-08 10:47:32 -05:00
Mechoid
551dd02a80
Setup for New Library
2019-11-04 21:25:18 -05:00
Atermonera
cd34901747
Merge pull request #6474 from Cerebulon/newsoct19
...
June-October News Update
2019-10-06 03:33:55 -04:00
Atermonera
bbb3201dc2
Merge pull request #6234 from Cerebulon/newsJune19
...
Feb-June News Update
2019-06-28 20:12:47 -04:00
Novacat
912111d5ea
Merge branch 'master' into upstream-merge-5908
2019-03-28 15:19:53 -04:00
Unknown
039b6c2b6c
Why is this even a conflict
2019-03-27 04:41:57 -04:00
Atermonera
49bdfc2db6
IC News update for 1st Jan
2019-03-27 04:41:39 -04:00
Novacat
8cb235f1e7
Merge pull request #4615 from VOREStation/upstream-merge-5795
...
[MIRROR] Standardises SifGov to VirGov
2019-03-27 03:40:16 -04:00
Atermonera
131636b1d2
Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding
2019-03-26 13:21:08 -04:00
Cerebulon
c64540d054
January News Update
2019-01-30 02:31:09 -05:00
Anewbe
a497071bac
Standardises SifGov to VirGov
2018-12-28 18:56:15 -05:00
Anewbe
0bcfa1a5b3
Merge pull request #5746 from elgeonmb/loreupdateepsilon
...
Adds like 4 million articles.
2018-12-07 21:04:21 -05:00
Arokha Sieyes
6b42df0685
Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
...
# Conflicts:
# code/__defines/misc.dm
# code/controllers/master_controller.dm
# code/game/machinery/computer3/computers/card.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/stacks/medical.dm
# code/game/objects/structures/signs.dm
# code/modules/admin/admin_verbs.dm
# code/modules/client/client defines.dm
# code/modules/client/client procs.dm
# code/modules/clothing/clothing.dm
# code/modules/clothing/under/accessories/holster.dm
# code/modules/events/radiation_storm.dm
# code/modules/mining/machine_processing.dm
# code/modules/mob/living/carbon/human/species/station/prometheans.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/simple_animal/animals/bear.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/living/simple_animal/animals/parrot.dm
# code/modules/mob/mob.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
# code/modules/reagents/reagent_dispenser.dm
# config/example/config.txt
# html/changelogs/.all_changelog.yml
# interface/skin.dmf
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-05-25 13:23:47 -04:00
elgeonmb
b0fb57fb02
may 15 lore ( #5268 )
...
* actually did it day of
* actually I think this is more fitting
* i never learrned how to spell good
2018-05-18 21:09:03 -07:00
elgeonmb
fb01f13175
hey guess what its the same thing again
2018-05-08 18:59:59 -07:00
Arokha Sieyes
6c686e6a2f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018
...
# Conflicts:
# README.md
# code/game/jobs/job/job.dm
# code/modules/client/preference_setup/loadout/loadout_utility.dm
# code/modules/mob/living/carbon/human/examine.dm
# code/modules/mob/living/carbon/human/npcs.dm
# code/modules/mob/living/carbon/human/species/station/prometheans.dm
# html/changelogs/.all_changelog.yml
# maps/RandomZLevels/Academy.dmm
# maps/RandomZLevels/beach.dmm
# maps/RandomZLevels/blackmarketpackers.dmm
# maps/RandomZLevels/challenge.dmm
# maps/RandomZLevels/example.dmm
# maps/RandomZLevels/jungle.dmm
# maps/RandomZLevels/listeningpost.dmm
# maps/RandomZLevels/spacebattle.dmm
# maps/RandomZLevels/stationCollision.dmm
# maps/RandomZLevels/wildwest.dmm
# maps/RandomZLevels/zresearchlabs.dmm
# maps/northern_star/polaris-1.dmm
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-6.dmm
# maps/southern_cross/southern_cross-7.dmm
# maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm
# maps/submaps/surface_submaps/plains/Boathouse.dmm
# maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
# maps/submaps/surface_submaps/wilderness/Boombase.dmm
# maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
# maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm
# maps/submaps/surface_submaps/wilderness/Drugden.dmm
# maps/submaps/surface_submaps/wilderness/Rockybase.dmm
# maps/submaps/surface_submaps/wilderness/Shack1.dmm
# maps/virgo/virgo-6.dmm
# vorestation.dme
2018-04-25 17:23:33 -04:00
elgeonmb
c12368b887
Adds new robot codex ( #5178 )
...
* adds new robot codex
* appeases ater
2018-04-20 10:30:06 -07:00
Aronai Sieyes
35ec513b28
Merge pull request #3452 from VOREStation/aro-sync-04122018
...
Polaris Sync 04-12-2018
2018-04-18 14:04:27 -04:00
Leshana
b5cf8383f6
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14
...
# Conflicts:
# code/game/machinery/jukebox.dm
# code/modules/economy/lorenews.dm
# code/modules/mob/living/carbon/human/update_icons.dm
2018-04-15 14:19:36 -04:00
Spades
cc39778217
Lore fixes, v1.01a
...
The "a" stands for arbitrary version control.
Also I had no idea how to do this correctly so I just copypasted like an
asshat into a new branch. :B
2018-04-14 20:14:10 -04:00
