cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-20 07:02:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,509 Commits 2 Branches 1 Tag
948d43afecadc272b215ec2e8c46f30a901b5c18
Commit Graph

1833 Commits

Author SHA1 Message Date
Spades
efc9011407 Merge remote-tracking branch 'refs/remotes/origin/master' into jukebox-v2 2016-10-04 16:04:09 -04:00
Anewbe
0d0322b93c Adjusts shotgun ammo box contents 2016-10-03 21:48:16 -05:00
Anewbe
6ba07bbb45 Merge pull request #2565 from SpadesNeil/supply-crates 
Fixes supplypacks.dm invalid group
 2016-10-02 12:29:36 -05:00
Spades
05c6be93ec Operations doesn't exist 2016-09-30 02:33:30 -04:00
Anewbe
9092c11ce6 Removes parapen from SpecOps crate 2016-09-25 21:16:07 -05:00
Neerti
801a162ba7 Ports the Port of Circuits 
Ports PsiOmegaDelta's port of integrated circuits, which has several improvements in code quality.
Ports a few small things like the weakref datum and some macros.
 2016-09-24 18:06:11 -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
redstryker
5e7540c4ae Tube Top 2016-09-03 15:59:08 -04:00
redstryker
c289007c87 Bowling Shirts 2016-09-02 07:39:21 -04:00
redstryker
d48e7c59cc Headgear Additions, and an Undershirt 2016-08-31 19:04:21 -04:00
Yoshax
f7c459d796 Merge pull request #2357 from SinTwo/framecleanup2 
Frame Cleanup + Machinery Code Cleanup
 2016-08-28 18:31:16 +01:00
SinTwo
a2a2f58e93 Fixes #2352 2016-08-27 13:44:32 -04:00
SinTwo
fa92cdeeda Merge branch 'master' of https://github.com/PolarisSS13/Polaris into framecleanup2 2016-08-23 18:33:51 -04:00
Spades
5cf098d980 Adds Jukebox hacking! 
Ported from Vorestation.
 2016-08-23 14:48:15 -04:00
SinTwo
eabefc538a Revert "Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade" 
This reverts commit 6bb5409349, reversing
changes made to f6a83d5ee0.
 2016-08-15 12:58:00 -04:00
SinTwo
6bb5409349 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade 
Conflicts:
	code/modules/admin/holder2.dm
 2016-08-15 12:26:53 -04:00
EmperorJon
f6a7d068d5 Merge pull request #2314 from Anewbe/taj_cleanup 
Taj cleanup
 2016-08-15 11:32:05 +01:00
Anewbe
0cb1f8c27a Cleans up the code to match recent Tajaran rewrite 2016-08-13 23:07:00 -05:00
SinTwo
045c393683 Revert "Revert "Frame Cleanup"" 
This reverts commit 82722ba42f.
 2016-08-13 19:55:57 -04:00
Hubblenaut
2c92802db5 Adds a verb for toggling specific pieces of underwear 2016-08-12 20:58:40 +02:00
SinTwo
f50adb9554 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade 
Conflicts:
	code/_helpers/time.dm
	code/modules/economy/ATM.dm
 2016-08-09 15:46:24 -04:00
Yoshax
89956eaaae Merge branch 'master' of https://github.com/PolarisSS13/Polaris into dufflebags 
# Conflicts:
#	code/datums/uplink/tools.dm
 2016-08-03 19:30:02 +01:00
Yoshax
6ac20b0053 Further uplink item changes. Attempts to reduce the price of some of the more potentially interesting items in an attempt to see them used more often. 2016-07-31 15:23:13 +01:00
Yoshax
dc7e196c82 Corrects surplus crate pricing to scale rewards the more you spend. Proper description can be found in the commit description. 
120 TC - 240 Worth - 2x Worth
240 TC - 540 Worth - 2.25x Worth
480 TC - 1200 Worth - 2.5x Worth
720 TC - 1980 Worth - 2.75x Worth
 2016-07-31 15:19:31 +01:00
Yoshax
62709429ed Adds "syndicate" dufflebags to the uplink 2016-07-31 14:53:23 +01:00
SinTwo
fe46fac5cc final new NanoUI fixes and tgui port 2016-07-27 23:01:26 -04:00
Anewbe
afaa35a5e6 Merge pull request #2215 from Yoshax/ammoprices 
Adjusts the uplink ammo costs
 2016-07-27 19:23:07 -05:00
Yoshax
e864ada371 Adjusts the uplink ammo costs 2016-07-27 21:42:36 +01:00
Yoshax
29ad42fea7 Does some stuff 2016-07-27 05:11:12 +01:00
Yoshax
c022725717 Blacklists teleporter board in uplinks for random item 2016-07-26 20:22:05 +01:00
Yoshax
6711cca0dd Adds a few items to the uplink 2016-07-26 02:44:14 +01:00
Yoshax
7fbb123a4d Improves/fixes surplus crate item selection 2016-07-25 23:13:12 +01:00
Yoshax
f19c922984 Improves surplus crates 2016-07-25 21:45:54 +01:00
EmperorJon
e43487726b Merge pull request #2199 from Yoshax/fixforitem 
Corrects an uplink item path
 2016-07-25 17:51:19 +01:00
Yoshax
75630d8e92 Corrects a path 2016-07-25 14:56:19 +01:00
Yoshax
eeb5e66c75 Adds orderable tank transfer valves (not actual bombs) to the cargo Phoron crate 2016-07-25 14:53:55 +01:00
Yoshax
9f2ffa9c03 Corrects an uplink item path 2016-07-25 14:39:43 +01:00
EmperorJon
cdb09d2946 Merge pull request #2188 from Yoshax/autolathe 
Rehauls some autolathe code
 2016-07-25 10:42:30 +01:00
Yoshax
6945aff868 Merge pull request #2187 from Anewbe/sec_coat_pockets 
Adds pockets to the HoS and Warden coats
 2016-07-25 01:41:45 +01:00
Anewbe
89e98a39fb Merge pull request #2181 from Yoshax/uplinkcosttweaks 
Uplink cost tweaks
 2016-07-24 17:13:03 -05:00
Yoshax
7e453226dc Rehauls some autolathe code 2016-07-24 22:02:58 +01:00
Anewbe
56f9e63c64 Adds pockets to the HoS and Warden coats 2016-07-24 15:55:54 -05:00
Yoshax
2f75d4757a Adds a missing path 2016-07-23 22:48:41 +01:00
Yoshax
ba106d48f9 Adjusts some gun costs 2016-07-23 21:38:30 +01:00
Yoshax
1fc10eaddb Adjusts surplus crates 2016-07-23 21:15:44 +01:00
Yoshax
305255d2ee Adjusts uplink item costs 2016-07-23 21:00:53 +01:00
Yoshax
93b7e661c4 Ensures contraband for supply computers can be properly acquired via hacking 2016-07-23 20:24:04 +01:00
Yoshax
fcf34eb54b Puts a couple of crates into the right file 2016-07-23 20:08:24 +01:00
Yoshax
b5d85c7d71 Converts the empty box supply crate into a shipping supplies crate 2016-07-23 20:05:59 +01:00
EmperorJon
a94cad7a59 Merge pull request #2168 from Yoshax/telecrystals 
Multiplies all Telecrystal stuff by ten to setup for fine cost adjusting
 2016-07-22 19:34:08 +01:00