f3e3905b41
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
2024-12-11 20:18:19 +01:00
87ce13b27c
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-2
2024-12-04 15:17:00 +01:00
9d3a7986d8
traffic update
...
more khi cleanup
2024-12-01 18:37:08 +00:00
058f219cb9
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
2024-11-30 23:30:26 +01:00
7be625e0cb
some more small things ( #16491 )
2024-10-18 23:36:19 +02:00
b594520a74
next set of spans ( #16434 )
...
* next set of spans
* some more
* next
* next
* next
* .
* text...
* next... rest soon
* .
* .
* ok last set for the night
* .
* .
* .
* .
* some more
* next
* next
* all for now
* .
* some more easy ones
* some more easy ones
* .
* .
* some more bolds
* oups auto complete moment
* add the remaining spans
* this as well
* this as well
* .
* .,
* resync them properly
2024-10-16 23:37:27 +02:00
f4f5476121
Merge branch 'master' into weapon-removal
2024-09-18 18:07:43 +02:00
8a90ae6523
only missing alt titles
2024-09-12 22:48:14 +02:00
4ba7beeb9c
up to field medic
2024-09-12 21:20:47 +02:00
8a3520e2e0
move all factions to defines
2024-09-12 20:17:41 +02:00
10dc8510b3
up to engineer
2024-09-12 02:01:36 +02:00
0425a4e396
up to officer
2024-09-12 00:00:11 +02:00
409aaba802
Remove
2024-09-09 02:36:53 +02:00
186475ef6d
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
2024-06-03 22:08:11 +02:00
7f68155411
Reduces amount of drone racism ( #15968 )
2024-05-06 16:25:03 +10:00
153c3abf2e
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2024-02-26 03:37:23 +01:00
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 afbdd1d8442973f5d570c30920d9d865b5acd479.
* Whitespace again minus example
* Gitignore example changelog
* Restore changelog merge setting
* Keep older dmi hook attribute until hooks can be updated
* update vscode settings too
* Renormalize remaining
* Revert "Gitignore example changelog"
This reverts commit de22ad375d3ee4d5930c550da2fd23a29a86e616.
* Attempt to normalize example.yml (and another file I guess)
* Try again
2024-02-20 11:28:51 +01:00
1c2d4da6bd
Merge branch 'release' of https://github.com/VOREStation/VOREStation into uppstream-update
2024-01-22 05:18:14 +01:00
9347a99f5b
Ports QoL, upgrades, and a lot of bug fixes
2024-01-18 21:04:36 -05:00
4088f40cc9
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-08-24 18:27:07 +02:00
271ff9408f
Spell Fixes
2023-06-18 12:47:36 +02:00
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
izac112