Anewbe
a497071bac
Standardises SifGov to VirGov
2018-12-28 18:56:15 -05:00
Leshana
a0de41f24f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15
...
# Conflicts:
# README.md
# code/__defines/mobs.dm
# code/__defines/subsystems.dm
# code/_helpers/global_lists.dm
# code/controllers/subsystems/garbage.dm
# code/controllers/subsystems/overlays.dm
# code/datums/datacore.dm
# code/datums/supplypacks/munitions.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/weapons/id cards/station_ids.dm
# code/game/objects/random/random.dm
# code/game/turfs/simulated/floor.dm
# code/game/turfs/simulated/floor_icon.dm
# code/modules/awaymissions/gateway.dm
# code/modules/client/preferences.dm
# code/modules/ext_scripts/python.dm
# code/modules/mob/living/carbon/human/human.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/living/carbon/human/species/station/station.dm
# code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
# code/modules/mob/living/carbon/human/update_icons.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/living_defines.dm
# code/modules/mob/living/simple_animal/animals/bear.dm
# code/modules/mob/mob_helpers.dm
# code/modules/mob/new_player/new_player.dm
# code/modules/mob/new_player/preferences_setup.dm
# code/modules/mob/new_player/sprite_accessories.dm
# code/modules/organs/organ_external.dm
# code/modules/organs/organ_icon.dm
# code/modules/organs/robolimbs.dm
# code/modules/reagents/reagent_containers/glass.dm
# code/modules/reagents/reagent_containers/syringes.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-4.dmm
# maps/southern_cross/southern_cross-6.dmm
# vorestation.dme
2018-03-15 22:41:14 -04:00
Cerebulon
b7090d7df2
Adds Tajaran Akhani language. ( #5032 )
...
* Adds Tajaran Akhani language.
Fixes plural form of Tajaran (Tajara->Tajaran) in about 50 places.
* Gives the language a colour distinct from Siik.
* Changelog
2018-03-11 16:55:08 -05:00
Leshana
27c3272821
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27
...
# Conflicts:
# code/ZAS/_docs.dm
# code/__defines/mobs.dm
# code/game/turfs/flooring/flooring_decals.dm
# code/game/turfs/simulated/walls.dm
# code/modules/client/preference_setup/loadout/loadout_utility.dm
# code/modules/lore_codex/codex.dm
# code/modules/mob/living/life.dm
# code/modules/mob/living/living_defines.dm
# 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/southern_cross/southern_cross_jobs.dm
# vorestation.dme
2018-01-27 23:08:53 -05:00
elgeonmb
3d5740c909
adds an e-reader full of news to the loadout ( #4619 )
...
* adds an e-reader full of news to the loadout
* Political Almanac -> Pocket Newscaster
2018-01-25 18:18:35 -06:00
killer653
0c480ec15f
Polaris sync
2017-10-27 15:30:24 -04:00
Anewbe
9295a9813e
Adds the Promethean loreblurb
2017-10-22 19:14:34 -05:00
Anewbe
04c393a953
Adds the Vatborn lore blurb, fixes some things.
2017-10-19 10:28:34 -05:00
killer653
1bb71ef429
Polaris Sync
2017-10-16 22:16:24 -04:00
Anewbe
f42457b997
Starts work on the Vatborn Human species
2017-10-15 23:26:22 -05:00
Neerti
1f0bb5891c
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 9/28/2017_web_shuttles
...
# Conflicts resolved:
# code/modules/busy_space/organizations.dm
2017-10-10 01:19:53 -04:00
Neerti
7225ea2b66
Read github PR for details.
2017-10-10 00:48:27 -04:00
killer653
fa1170c7e8
Should fix all the corp regs & codex issues
2017-10-09 23:42:08 -04:00
Anewbe
0de6cddef5
Activates Neerti's Lawbook
2017-10-03 22:29:50 -05:00
Anewbe
bf7dce79cc
Unathi mechanical changes ( #3256 )
...
* Unathi changes
* Tweaks blurb
* Alcohol tweaks
* Age tweak
* Slowdown
* Adds Unathi to the codex
* Fixes Unathi Organs, adds sprites
* Fixed the changelog
* Sprite and language tweaks, Unathi
2017-04-19 13:42:51 -04:00
Neerti
a4a05ae4ec
Implements the new Codex.
2017-04-08 12:08:08 -04:00
