Commit Graph

50 Commits

Author SHA1 Message Date
Jakksergal 60871e9e97 Reinstates all changes prior to VOREstation sync 2018-02-27 21:48:15 -08:00
Arokha Sieyes 0283389df3 Clean up shuttle references
Edit some strings mentioning the shuttle instead of the tram.
2017-11-28 13:54:31 -05:00
Spades c501e16e05 Update organizations_vr.dm
Auream Imperium not Imperium Auream.
2017-11-15 19:45:25 -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
Spades 07762f31e7 Some disorganizes changes by Aces
- UNSC is now USDF.
- .32 is now .380 instead.
- Added giskard to random gun spawns.
- Changed oliva to be a subtype of giskard.
- Rebalanced random gun spawner and added things.
- Detective no longer spawns with a pistol. It's in your locker instead.
- `SMG_sol` is now just `sol`.
- Fixed some ammo pathing to be consistent.
- Moves Asset Protection spawn point inside the big armory at CentCom.
- Adds a door in CentCom to let the ERT area actually be reached from
CentCom's bridge.
2017-09-21 03:22:20 -04: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 a55d4c5e4c Imperial Military Update
Adds Imperial stuff for our space elf romans.
2017-09-02 04:07:25 -04:00
Spades 0a808a5cb4 Quick text hotfix 2017-08-14 04:04:51 -04:00
Spades 7b47cbc5ad Update organizations_vr.dm 2017-08-13 04:01:20 -04:00
Spades 6a29a35063 " 2017-08-13 02:36:46 -04:00
Spades 9fada8c3dd Changing this while I'm at it. 2017-08-13 00:29:25 -04:00
Spades 31146ec22f inconsistent indentation fixed 2017-08-10 18:59:13 -04:00
Spades 42e3b650d2 oh right and we have a new superpower faction 2017-08-10 18:44:38 -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
killer653 468e73c7f3 Polaris sync 2017-08-06 19:07:17 -04:00
Anewbe 5b51ca49cf More Morpheus ship names 2017-07-25 19:21:27 -05:00
Leshana 5f5ea3ea3b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-merge-2017-05-26
# Conflicts:
#	code/game/gamemodes/technomancer/spells/insert/mend_burns.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_metal.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_organs.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_wires.dm
#	code/game/machinery/computer/Operating.dm
#	code/game/machinery/computer/camera.dm
#	code/game/machinery/computer/communications.dm
#	code/game/machinery/computer/security.dm
#	code/game/machinery/computer/skills.dm
#	code/game/objects/items/devices/radio/jammer.dm
#	html/changelogs/.all_changelog.yml
#	maps/~map_system/maps.dm
#	nano/images/nanomap_z1.png
#	nano/images/nanomap_z5.png
2017-05-26 15:29:46 -04:00
MagmaRam a7d99942f4 Merge pull request #3443 from Anewbe/sifDefenseForce
[Lore] Renames the Sif Homeguard to Sif Defense Force
2017-05-23 20:38:44 -05:00
Leshana 75e9f619fa Fix runtime in air_traffic.dm due to bad organizations in loremaster.
* Loremaster was loading all subtypes of /datum/lore/organization, but some intermediate subtypes are never meant to be used (such as /datum/lore/organization/mil)
* These intermediate subtypes have no names, and no ship_prefixes, so crash the ATC.
* Fix by not loading ones not meant to be loaded.  Detected by checking if they have a non-null name.
2017-05-15 23:14:34 -04: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
Leshana 4fbfa7ee37 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08
# Conflicts:
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/mob_defines.dm
#	html/changelogs/.all_changelog.yml
#	vorestation.dme
2017-05-08 21:07:45 -04:00
Anewbe 5f94cce5c7 Adds more Morpheus ship names 2017-04-25 19:11:41 -05:00
Arokha Sieyes 6a98b982a7 Update Codex to have our lore
Updates the lore in the Codex books to be accurate to our lore, and invented a bunch of extra lore on the spot to make it make sense. Seems fine to meeeeeeee.
2017-04-25 18:59:05 -04:00
Arokha Sieyes e7d8af7ae7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/mob/mob.dm
#	html/changelogs/.all_changelog.yml
2017-04-10 20:41:18 -04: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
Arokha Sieyes 94f352ab59 One more busy_space change 2017-03-18 01:16:45 -04:00
Arokha Sieyes 853de169ec Remove unused defines for busy_space 2017-03-18 01:16:17 -04:00
Arokha Sieyes 805b473976 Polaris Sync Merge
Fixed Polaris merge conflicts
* Space controller merge conflict
2017-03-18 00:58:12 -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
Arokha Sieyes 23ae8c35cf Space Chatter
Adds random space traffic control chatter during the game. It's rare, not spammy. Like every 35 minutes it has one short conversation.

It adds a bunch of lore datums about different parties in space and ship names and stuff. That can be used for other stuff later.

If you find it annoying, you can disable it at the comms consoles (don't need to log in, anyone can do it).

***Normal traffic***
[Common] SCV Falken states, "Virgo TraCon, this is Federation SCV Falken on a military route to the Gateway 98-C at Arest, requesting refueling information."
[Common] Virgo Air/Space Control states, "Federation SCV Falken, this is Virgo TraCon, sending refueling information now."
[Common] SCV Falken states, "Virgo TraCon, thank you, good day."

***5% chance of wrong frequency***
[Common] SDV Lucina states, "Sol Command, this is Federation SDV Lucina on a diplomatic flight to NSB Checkmate, requesting remote telemetry data."
[Common] Virgo Air/Space Control states, "Federation SDV Lucina, this is Virgo TraCon, wrong frequency. Switch to 855.2."
[Common] SDV Lucina states, "Virgo TraCon, understood, apologies."

***2% chance of emergency traffic***
[Common] UNSC Colorado states, "This is Navy UNSC Colorado declaring an emergency! We have unknown life forms on board!"
[Common] Virgo Air/Space Control states, "Navy UNSC Colorado, this is Virgo TraCon, copy. Switch to emergency responder channel 639.2."
[Common] UNSC Colorado states, "Virgo TraCon, okay, switching now."
2017-03-01 15:32:43 -05:00