Commit Graph

32322 Commits

Author SHA1 Message Date
Neerti
0debdd3bf2 Finalizes work, adds designs to research. 2016-09-13 17:08:12 -04:00
Spades
313780b890 Almost forgot plural of Telecomm 2016-09-13 16:44:04 -04:00
Spades
9c78d6a2a1 Naming inconsistencies fixed
The short naming of central command has been really inconsistent across
the game's files. This has always annoyed the shit out of me.

CentComm and Centcomm and Centcom are now all CentCom, specifically with
that capitalization. Why one M instead of two M's? Because Comm with two
'M's = Communications. Hence, Telecomms, NOT Telecoms. Telecoms is
incorrect. CentCom was also chosen because CentCom with one M and this
casing is most found throughout the game's files.

Speaking of Telecomms, I corrected one instance in the game where it's
Telecom. Like I said, this is not correct. There was only one
inconsistency.

Likewise, Nanotrasen has been changed to NanoTrasen. Nanotrasen only
appears 20 times, where NanoTrasen appears 62. NanoTrasen is clearly the
preferred, correct naming.
2016-09-13 16:36:43 -04:00
Spades
21cbe8caa6 Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into Naming-Consistency 2016-09-13 16:36:15 -04:00
Spades
096f89ad7b Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' 2016-09-13 16:27:48 -04:00
Neerti
53d9eef7ff Merge pull request #2445 from redstryker/TheViralCommit
Biohazard Voidsuit
2016-09-13 15:50:55 -04:00
Neerti
bdcc0a0733 Merge pull request #2454 from Anewbe/splints
Splints are no longer reusable
2016-09-13 09:23:13 -04:00
Anewbe
3dad5bb461 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into blood_drain 2016-09-12 23:59:35 -05:00
Anewbe
2c8a8bb6e8 There's plenty lying around, I think 2016-09-12 23:54:34 -05:00
Neerti
878906becb Merge pull request #2452 from Anewbe/muscular_dihydrogen_monoxide
Water is now more useful on burning people
2016-09-12 17:38:17 -04:00
Anewbe
3941918b35 Water > Fire 2016-09-12 16:11:21 -05:00
Anewbe
c6715ddb35 Merge pull request #2451 from Yoshax/flashrounds
Makes flash rounds respect eye protection
2016-09-12 14:26:06 -05:00
Yoshax
98d08cbc56 Makes flash rounds respect eye protection 2016-09-12 19:10:07 +01:00
Anewbe
4f917f614b Merge pull request #2450 from PolarisSS13/revert-2446-revert-2375-revert-2361-hubbity
Revert "Revert "Revert "Adds hub passwordu"""
2016-09-11 23:41:31 -05:00
Neerti
3f7646c548 Revert "Revert "Revert "Adds hub passwordu""" 2016-09-11 20:23:10 -04:00
Neerti
2fea474564 Merge pull request #2447 from Anewbe/implant
Explosive implants should no longer gib on limbs.
2016-09-11 17:50:47 -04:00
Screemonster
5f38263732 Adds space penguins and space geese. 2016-09-11 22:17:22 +01:00
Anewbe
dfa53aab6e Explosive implants should no longer gib on limbs. 2016-09-11 15:18:28 -05:00
Neerti
9abe71e0a9 Merge pull request #2441 from Anewbe/newnathi_icon
New Unathi Sprite
2016-09-11 14:36:06 -04:00
Neerti
ce811b6c8b Merge pull request #2443 from Yoshax/MYHEARTBLEEDS
makes people bleed gud
2016-09-11 14:35:56 -04:00
Neerti
91d8a6f97d Merge pull request #2446 from PolarisSS13/revert-2375-revert-2361-hubbity
Revert "Revert "Adds hub passwordu""
2016-09-09 20:13:23 -04:00
Neerti
9f6b9ed05d Revert "Revert "Adds hub passwordu"" 2016-09-09 20:06:55 -04:00
redstryker
dfb9bd6461 Biohazard Voidsuit 2016-09-09 16:49:48 -04:00
Anewbe
8e184fa2f7 Merge pull request #2442 from redstryker/ConstructiveCriticism
Construction Voidsuits
2016-09-08 20:39:12 -05:00
Yoshax
9e7496c45d adderino changeling 2016-09-09 02:22:02 +01:00
Yoshax
c5121cf4e7 makes people bleed real good 2016-09-09 02:21:10 +01:00
redstryker
4e33e82714 Construction Voidsuits 2016-09-08 19:31:47 -04:00
Neerti
e81ccd608f Merge pull request #2428 from redstryker/HaveASecureDay
Fuzzy Cuffs
2016-09-08 19:26:40 -04:00
Anewbe
2686dfdd1c Adds changelog 2016-09-08 18:02:56 -05:00
Spades
7575e70706 Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' 2016-09-08 18:18:49 -04:00
Anewbe
9d92f06d0e Merge pull request #2434 from redstryker/RADicalSuits
HAZMAT Suits
2016-09-08 17:04:54 -05:00
Neerti
db97087db0 Merge pull request #2438 from Anewbe/skirt_fix
Tweaks skirt pathing
2016-09-08 18:04:47 -04:00
Anewbe
a1d784b1c1 Corrects changelog 2016-09-07 17:07:46 -05:00
Anewbe
b7353696db Tweaks skirt pathing 2016-09-06 22:31:42 -05:00
Spades
dd23b337f4 Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' 2016-09-06 21:11:39 -04:00
Anewbe
410ed4a8e2 Changes Unathi sprite slightly 2016-09-05 22:55:32 -05:00
redstryker
a5376e4428 HAZMAT Suits 2016-09-05 21:19:00 -04:00
Anewbe
a94073a900 Merge pull request #2432 from redstryker/AlwaysWearAGlove,Kids!
Fixes Evening Glove Coloring
2016-09-05 14:30:57 -05:00
redstryker
206fc072c4 Fixes Evening Glove Coloring 2016-09-05 15:09:53 -04:00
Neerti
7747e483c4 Merge pull request #2424 from Anewbe/ninja_poof
Ninjas leave no trace
2016-09-04 19:58:43 -04:00
Anewbe
35574307c0 Adds organ fixing 2016-09-04 16:49:24 -05:00
Anewbe
da23072bf8 Merge pull request #2427 from SpadesNeil/medicine
Medical related fixes
2016-09-04 16:48:41 -05:00
Spades
50140d6ad6 Just the fix to random med item now 2016-09-04 17:32:21 -04:00
Spades
a0cc7c1050 Revert "Medical related fixes"
This reverts commit d7c59520e6.
2016-09-04 17:31:48 -04:00
Spades
36c0da90d4 Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' 2016-09-03 17:33:01 -04:00
Anewbe
cf4785364b Merge pull request #2426 from redstryker/UnathiLiposuction
Makes Unathi Voidsuits Less Fat
2016-09-03 16:12:09 -05:00
redstryker
731d0b185f Made Icons for Security Suit Less Gaunt 2016-09-03 16:55:36 -04:00
Anewbe
a523232880 Merge pull request #2430 from redstryker/AddsMoreTubing
Tube Top
2016-09-03 15:45:15 -05:00
redstryker
5e7540c4ae Tube Top 2016-09-03 15:59:08 -04:00
redstryker
2113af4ca2 Fuzzy Cuffs 2016-09-03 14:03:10 -04:00