cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,865 Commits 6 Branches 0 Tags
499e8e7ee9b2f51a9e2fae8faaf0d67f16cd86f5
Commit Graph

69 Commits

Author SHA1 Message Date
CHOMPStation2StaffMirrorBot
891d585ede [MIRROR] Space Traffic Update, Cleanup, & KHI Removal (#9600) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-12-08 21:10:26 +01:00
CHOMPStation2
39ab514759 [MIRROR] fixes broken chars (#7892) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-03-10 14:51:55 +01:00
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
izac112
e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
 2020-05-06 21:53:03 +02:00
Novacat
3eaa2ad9fa Lore Overhaul (#7493) 
* Lore Overhaul

* Further Updates

* Changes the year

* Reverts unedited files adds Dragor's file

* Fixes compile error

* Spelling error

* Fixfix

* Comma fixes!

* Parenthesis fix

* Removes Virgov references

* Purges remnants of UC

* Recommended Change

* More consistent naming
 2020-04-29 19:59:03 -04:00
TheFurryFeline
b616d15cb6 Shuttle Transfer, Not Tram 
Title.

Changelog Notes: 

- Makes transfer stuff show Shuttle as transfer vehicle/mode. Not the Tram.
 2019-12-28 02:37:15 -05:00
Neerti
f8c9664178 Explorer Update - Cataloguers 2019-03-30 16:19:24 -04:00
Novacat
8cb235f1e7 Merge pull request #4615 from VOREStation/upstream-merge-5795 
[MIRROR] Standardises SifGov to VirGov
 2019-03-27 03:40:16 -04:00
Unknown
486602c194 Conflict Resolution 2019-03-27 03:27:53 -04:00
Neerti
86174593bf Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer 2019-03-26 23:58:26 -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
Spades
8f7015d409 Lore updates (#3430) 
* Lore-updates

This PR is entirely stuff to update in-game content to match lore on the
wiki.

I haven't decided if it's done or not.

* Let's first make it actually work

* Fixes a few things, also adds ONI

* [screams in feeling]

* Fixes some lore shit
 2018-04-14 12:58:42 -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
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