4cc81d7c73
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-03-19 22:24:48 +01:00
19715ab471
/tg/ era language pass
2023-02-25 02:34:24 -05:00
53f54d78e6
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-01-03 21:12:41 +01:00
4bbf9efacb
Some runtime fixes + oldchat icons
2022-12-18 06:40:13 +10:00
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
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
dc36fe9b8f
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-10-16 22:52:41 +02:00
3801bf0e4b
Update main.dm
2022-10-01 20:24:14 -04:00
0f563c7dd7
Post-Timeskip News Update
2022-10-01 14:18:08 -04:00
efa4a73716
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-08-28 12:48:22 +02:00
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
5a1990d372
Changes Hephaestus lore entry to "Hegemony War" from "First Contact"
2022-08-20 15:14:10 +02:00
79129773b6
Fixes date from 2542 to 2302 in lorebook
2022-08-20 13:12:50 +02:00
f3c88225ce
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-08-29 10:22:30 +02:00
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
0e8bfd43dc
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-03-24 07:49:59 +01:00
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
9c6581fe6c
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-03-11 17:36:42 +01:00
0665d37c78
Lobby Improvements
2021-02-21 16:33:23 -05:00
ccea122324
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
2021-02-14 00:33:44 +01:00
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
74d84d2cff
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-08-17 09:44:00 +02:00
1266d146b1
Merge pull request #7483 from Cerebulon/newsAug2020
...
News update... April-May 2020
2020-08-15 23:51:52 -04:00
1456af50f7
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-07-14 00:21:02 +02:00
99a977ee3d
Merge pull request #6799 from Cerebulon/booksprites
...
New book sprites + inhands
2020-07-09 17:33:58 -04:00
4864ad384d
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-06-17 04:30:06 +02:00
bd50595244
improved traffic, take two
2020-06-10 22:26:23 +01:00
7f1a6d6cc7
Fuck this shit
...
Merge branch 'release' of https://github.com/VOREStation/VOREStation
# Conflicts:
# code/controllers/autotransfer.dm
# code/controllers/subsystems/inactivity.dm
# code/game/area/Away Mission areas.dm
# code/game/area/Space Station 13 areas.dm
# code/game/jobs/job/captain.dm
# code/game/jobs/job/civilian.dm
# code/game/jobs/job/security.dm
# code/game/jobs/jobs.dm
# code/game/machinery/air_alarm.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/machinery/suit_storage_unit_vr.dm
# code/game/mecha/combat/gorilla.dm
# code/game/turfs/simulated/dungeon/wall.dm
# code/game/turfs/simulated/wall_types.dm
# code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
# code/modules/clothing/spacesuits/void/void_vr.dm
# code/modules/clothing/under/accessories/holster.dm
# code/modules/mob/language/station_vr.dm
# code/modules/mob/living/carbon/human/emote_vr.dm
# code/modules/mob/living/carbon/human/species/station/station_vr.dm
# code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
# code/modules/mob/new_player/sprite_accessories_vr.dm
# code/modules/power/apc.dm
# code/modules/power/lighting.dm
# code/modules/resleeving/machines.dm
# config/jobwhitelist.txt
# icons/mob/species/seromi/head.dmi
# icons/mob/species/seromi/suit.dmi
# icons/mob/species/vulpkanin/helmet.dmi
# icons/mob/species/vulpkanin/suit.dmi
# maps/tether/submaps/_tether_submaps.dm
# maps/tether/tether_areas2.dm
# maps/tether/tether_defines.dm
# maps/tether/tether_shuttles.dm
# nano/templates/apc.tmpl
# vorestation.dme
2020-04-04 14:37:55 -04:00
4c7db1fc2d
Update codex.dm
2020-03-15 14:45:18 -04:00
8d2b41ad2c
Big Bastard Incidental Sound Port
2020-03-15 14:39:19 -04:00
6bcb84b44a
Merge pull request #6796 from Cerebulon/newsUpdatemar2020
...
Oct-Feb News Update
2020-03-10 03:37:49 -04:00
66d2758399
added grey+vox to the codex
...
plus some other minor proofreading, and removal of a now-dead link
2020-03-06 14:25:00 +00:00
13e5e7a495
traffic & lore update
2020-03-06 06:25:27 +00:00
92e988d3c4
edit comments
2020-02-16 06:34:09 +00:00
76f4ffe0de
traffic!
2020-02-16 05:28:11 +00:00
7931795ddd
Compatability, Re-enables old library
2019-11-08 10:47:32 -05:00
551dd02a80
Setup for New Library
2019-11-04 21:25:18 -05:00
cd34901747
Merge pull request #6474 from Cerebulon/newsoct19
...
June-October News Update
2019-10-06 03:33:55 -04:00
bbb3201dc2
Merge pull request #6234 from Cerebulon/newsJune19
...
Feb-June News Update
2019-06-28 20:12:47 -04:00
912111d5ea
Merge branch 'master' into upstream-merge-5908
2019-03-28 15:19:53 -04:00
039b6c2b6c
Why is this even a conflict
2019-03-27 04:41:57 -04:00
49bdfc2db6
IC News update for 1st Jan
2019-03-27 04:41:39 -04:00
8cb235f1e7
Merge pull request #4615 from VOREStation/upstream-merge-5795
...
[MIRROR] Standardises SifGov to VirGov
2019-03-27 03:40:16 -04:00
131636b1d2
Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding
2019-03-26 13:21:08 -04:00
c64540d054
January News Update
2019-01-30 02:31:09 -05:00
a497071bac
Standardises SifGov to VirGov
2018-12-28 18:56:15 -05:00
0bcfa1a5b3
Merge pull request #5746 from elgeonmb/loreupdateepsilon
...
Adds like 4 million articles.
2018-12-07 21:04:21 -05:00
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
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
fb01f13175
hey guess what its the same thing again
2018-05-08 18:59:59 -07:00
izac112