Commit Graph

2664 Commits

Author SHA1 Message Date
Anewbe 79eb840538 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vatborn 2017-10-19 09:57:26 -05:00
mistyLuminescence e76447a719 Loadout stuff, but done right! (#4094)
* Loadout and accessory path tweaks.

* updated: armbands

* except it's better now

* no ian shirt and psych medHUD, travis fixed?

* OKAY ROUND THREE
2017-10-19 09:36:15 -05:00
killer653 1bb71ef429 Polaris Sync 2017-10-16 22:16:24 -04:00
Neerti 5af9c1971d Merge pull request #4077 from Anewbe/rings
Rings
2017-10-16 19:04:36 -04:00
Anewbe d886e52ac3 Merge pull request #4080 from shazbot194/Synth_color
Synth Coloring
2017-10-16 17:55:24 -05:00
Neerti 9ae54fb2ac Merge pull request #4083 from Anewbe/trait_fix
Trait tweaks
2017-10-16 18:51:01 -04:00
Anewbe 03aa2d691d Trait tweaks 2017-10-16 01:07:56 -05:00
Anewbe f42457b997 Starts work on the Vatborn Human species 2017-10-15 23:26:22 -05:00
shazbot194 d199d4caf7 Adds in the option to color all synth parts and two sets of parts
As the titles says
2017-10-15 14:56:14 -08:00
Anewbe 3c2831e5d9 Adds rings 2017-10-15 15:05:52 -05:00
Kholdstare34 becc2e4290 Adds heads of staff cloaks, adds them to the loadout. 2017-10-15 15:02:25 -05:00
Anewbe 61aaf8ffee Loadouts should be fixed. 2017-10-13 10:54:13 -05:00
Neerti a8513844ec Adds a Trait system (#4048)
* Works on trait system, wip.

* Finalizes traits.
Fixes a few bugs with medical machines assuming a max health of 100.
2017-10-13 01:17:39 -05:00
Anewbe dea7346b94 Fixes the autologging items in antag records 2017-10-11 21:16:18 -05:00
Cyantime b38819afe2 Fixes a typo in alternate job title selection. 2017-10-10 14:19:21 -04:00
killer653 fa1170c7e8 Should fix all the corp regs & codex issues 2017-10-09 23:42:08 -04:00
Cameron Lennox 15a6472d14 Pol Sync 2017-10-08 17:44:25 -04:00
Neerti 7266310755 Merge pull request #4025 from Anewbe/prosthetic_organs
Prosthetic Organs Tweaks
2017-10-06 01:18:16 -04:00
Anewbe 9d5dd1cc48 Allows use of more internal prosthetic organs 2017-10-05 20:42:03 -05:00
Neerti 4b1eb3a19a Merge pull request #4017 from Anewbe/lawbook
Adds Neerti's Law Book
2017-10-05 12:56:23 -04:00
Anewbe 0de6cddef5 Activates Neerti's Lawbook 2017-10-03 22:29:50 -05:00
killer653 58a85b059f Allows the ability to Ckey lock hair 2017-10-03 18:04:31 -04:00
Anewbe 860c1d2e9f Makes the auto-antag-record logging for loadout items prettier 2017-10-02 03:08:01 -05:00
Cameron653 b83a7c4370 Makes neutral traits not take trait slots 2017-09-30 13:35:25 -04:00
Anewbe 7c5d7c4d75 Improves tracking implant code, adds a tracking implant variant to the loadout 2017-09-28 20:25:46 -05:00
killer653 2755d3ddb1 HOTFIX 2017-09-21 20:26:48 -04:00
Belsima 18346b864a The new default for 'if you don't get your job' is assistant. 2017-09-18 10:15:06 -04:00
Belsima cc712ed20e Adds a new hud & removes red crosses from huds. (#3846)
* Adds a new hud & removes red crosses from huds.

* Changeling.

* i missed a comma
2017-09-17 19:07:32 -05:00
killer653 bddfa16f82 Polaris sync 2017-09-15 21:17:34 -04:00
Belsima fb0e4d3cf9 General uniform updates. (#3814)
* General uniform update.

* Maps in bathrobe.

* Revert "Maps in bathrobe."

This reverts commit 9cbe47671da7a452cb5ac040aeefdcb98dbe180a.

* Fixes cheongsams and maps in the bath robe.

* Removes unintentionally added sprite.

* Assorted bugfixes.
2017-09-15 17:14:20 -05:00
killer653 47afd1502d Adds a loincloth to the xeno loadout 2017-09-11 21:18:29 -04:00
Belsima 7359c6f7a6 Fixes up the PR. 2017-09-09 23:17:41 -04:00
Belsima 022eb8cf4c Standardizes spellings to wiki and adds more major corps and places to setup. 2017-09-09 12:20:08 -04:00
Verkister 3bd672954d Tough boy fluff stuff (Opie goggles + 2 special offer general loadout items)
-Adds the approved fluff goggles https://forum.vore-station.net/viewtopic.php?f=26&t=1073
-Also adds general use metal necklace thingy and a colorable headband for loadout selection.
2017-09-06 15:55:16 +03:00
killer653 e2ea7951d3 Teshari stuff was added to Polaris. 2017-08-28 21:22:05 -04:00
killer653 cafac8efae Polaris Sync 2017-08-28 20:52:11 -04:00
Anewbe 3650fb1562 Merge pull request #3699 from Belsima/master
A load of Teshari stuff: For Real This Time
2017-08-16 22:53:00 -04:00
Anewbe ad4b439e96 Merge pull request #3680 from Neerti/8/4/2017_arrivals
Makes Arrivals Shuttle Great
2017-08-14 21:59:18 -04:00
Spades e0db8feb50 Merge pull request #1996 from Cameron653/SPIDER_RACE
Spider race & modifications!
2017-08-14 00:31:39 -04:00
Verkister 22e6bcb520 Enables dual coloring for ears.
-Ya know how a bunch of the ear options have that untouchable bright white inner part?
-You can touch it now :D
-Also renames the ear color vars for better compatibility and consistency.(red/g/b_ear > r/g/b_ears etc)
2017-08-13 15:20:11 +03:00
killer653 dc828eaab0 Spiders! 2017-08-12 23:02:38 -04:00
Spades c8f16aa2b6 Merge pull request #1972 from VOREStation/solgov-lore-fixes
Return of the UNSC
2017-08-10 19:55:33 -04:00
Belsima cb7b9ca64e please don't get mad at me github 2017-08-10 16:12:29 -04:00
Belsima d4e3b4453d A load of Teshari stuff: For Real This time 2017-08-10 16:12:16 -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 a2f346df0f Makes wings their own seperate entity on char setup 2017-08-10 07:12:22 -04:00
PrismaticGynoid 1f1f537e1c Better Wheelchairs
Wheelchairs can now be collapsed by click-dragging them to you, much like rollerbeds. You can then pick them up. They are, however, too large to stuff into a backpack.
These new collapsible wheelchairs are now available in the loadout, under utility, for 4 points. They're also color-customizable now. No more plain white wheelchairs available only by missing feet.
The loadout wheelchairs will spawn with you buckled into them, just like how it works when you spawn without feet, except that the loadout wheelchairs can be more colors than just white.
2017-08-09 00:48:13 -07:00
killer653 468e73c7f3 Polaris sync 2017-08-06 19:07:17 -04:00
Neerti 9d98406833 Makes Arrivals Shuttle Great
Arrivals shuttle now moves automatically to and from the station.  People still spawn onboard if they join the round with arrivals selected in preferences.
The shuttle is completely automated and will go to the station if someone boards it, and leave if nobody is onboard.
Changes some tape code so it can be mapped in.
Sadly the mapmerger is broken so the map file diff is massive.
2017-08-05 15:18:55 -04:00
Cameron653 23d553185e Adds tab 2017-08-04 19:27:12 -04:00