Neerti
f8c9664178
Explorer Update - Cataloguers
2019-03-30 16:19:24 -04:00
Unknown
486602c194
Conflict Resolution
2019-03-27 03:27:53 -04:00
Anewbe
a497071bac
Standardises SifGov to VirGov
2018-12-28 18:56:15 -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
439de7a4cf
ATC Revamp, Part One Of Unknown ( #5238 )
...
* adds a shitload of new atc content
2018-05-05 12:09:08 -07: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
elgeonmb
117decacb7
Polar-izes shipping locations
...
may this be the last fucking time I have to type out all those systems I swear to god
2018-04-08 17:48:32 -07:00
Belsima
99e7a7f1c5
i refuse to not add this name
2018-04-04 09:31:12 -04: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
Belsima
65779eff44
Ward-Takahashi names + Northern Star
2018-03-07 15:12:51 -05:00
killer653
11c195debb
Polaris Sync
2017-11-04 13:37:13 -04:00
Atermonera
61a9c434f1
ATC ships won't go to the current station
2017-10-31 22:59:34 -07:00
killer653
0c480ec15f
Polaris sync
2017-10-27 15:30:24 -04:00
Cyantime
1e9012b85a
Decapitalizes a destination
2017-10-25 03:12:29 -04:00
killer653
1bb71ef429
Polaris Sync
2017-10-16 22:16:24 -04:00
elgeonmb
9213d36bfb
Adds new names to the NT ship list ( #4064 )
...
* adds new names to the NT ship list
a bunch of overlooked scientists, also Jans and Friede of the "you must be this smart to ride this ride" positronic test
* removes duplicate tesla
2017-10-15 15:04:26 -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
elgeonmb
4e87fe4161
Veyships2 ( #4037 )
...
* It's not all Morpheus this time (#1 )
* ship names
2017-10-09 23:32:01 -05:00
Cameron Lennox
15a6472d14
Pol Sync
2017-10-08 17:44:25 -04:00
Anewbe
6f5837177a
It's not all Morpheus this time
2017-10-07 15:57:32 -05:00
elgeonmb
18e60b0f57
Update organizations.dm
2017-10-05 01:18:46 -07:00
elgeonmb
4fe72daba3
curlyboy
2017-10-04 17:31:16 -07:00
elgeonmb
5361299b9f
Update organizations.dm
2017-10-04 17:30:13 -07:00
elgeonmb
1cb7f36c6c
Adds new organization-specific locations in the tracon module
...
and misc tweaks.
1) Adds systems with lore and trade with SCG to the generic destinations list
2)Gives Vey-Med some Skrell-focused destinations
3)Gives Heph some millitary destinations
4)Gives Morpheus trade with Shelf
5)Strips out the "Icarus" generic ship name and the NDV Icarus Nanotrasen destination. Suddenly this word has a lot of history and I somehow don't see NT naming a ship after the political party they're bitterly opposed to
2017-10-04 17:18:43 -07:00
Anewbe
fe925df8c2
Adds a bunch of Morpheus ship names, again.
2017-09-17 22:04:57 -05:00
killer653
bddfa16f82
Polaris sync
2017-09-15 21:17:34 -04:00
Belsima
7359c6f7a6
Fixes up the PR.
2017-09-09 23:17:41 -04:00
Spades
fe7ba8036d
Return of the UNSC
...
- Overwrote SolGov lore.
- Removed mentions of SifGuard.
- Confederate is now just Central because Confederacy is a stupid type
of government for something with decent cohesion on the galactic stage.
- Stuff I'm not done with
- I'm fucking tired
- Zzzzzzzzzzzzzzzz
2017-08-10 14:22:26 -04:00
Anewbe
5b51ca49cf
More Morpheus ship names
2017-07-25 19:21:27 -05:00
Anewbe
82194a63c0
Adds specificity to SifGuard's HQ
2017-05-12 16:53:11 -05:00
Anewbe
3109419c93
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sifDefenseForce
2017-05-12 16:22:09 -05:00
Anewbe
69896f3133
Renames the Sif Homeguard Corps to Sif Defense Force
2017-05-12 16:21:51 -05:00
Anewbe
5f94cce5c7
Adds more Morpheus ship names
2017-04-25 19:11:41 -05:00
Leshana
a23be7759b
Fix the runtime on server boot caused by uninitialized using_map
2017-04-09 16:12:47 -04:00
Neerti
a4a05ae4ec
Implements the new Codex.
2017-04-08 12:08:08 -04:00
Neerti
b706595d57
Makes red alert and evacs silence the atc
...
Comments out military ships because lore for them is not finalized.
2017-03-13 07:41:10 -04:00
Neerti
9dbd05e8d4
Ports Vore's Space Traffic Controller feature.
...
Ports Vore's fluff spaceships that talk on comms every ~40 minutes.
2017-03-08 22:06:48 -05:00
