Commit Graph

1342 Commits

Author SHA1 Message Date
Anewbe
771d8b9e4b Adds a smaller device cell for use in non-weapon devices 2016-10-08 15:34:18 -05:00
Spades
85e3f0e40e Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into jukebox-v2
# Conflicts:
#	polaris.dme
2016-10-06 23:54:45 -04:00
Anewbe
673e75832a Merge pull request #2602 from SpadesNeil/death-to-the-administrator
Replaces Station Administrator with Colony Director, NASA Approved
2016-10-06 22:31:14 -05:00
Spades
2330968176 Replaces Station Administrator 2016-10-06 22:38:02 -04:00
Anewbe
1a442aa7cc Merge things 2016-10-06 21:37:10 -05:00
Anewbe
0f51fda83a Energy weapons can be reloaded 2016-10-06 21:30:52 -05:00
Anewbe
7e79d9b5f8 Merge pull request #2596 from Neerti/10/5/2016_event_system
Cleans Up WIP Event System + New Grid Check For It
2016-10-06 20:45:55 -05:00
Neerti
337ef499a1 Cleans Up WIP Event System + New Grid Check For It
Separates the 'count and assess everything' stuff to it's own datum, called the metric datum, which I plan to add on to in the future to make counting and metrics easier.
Makes decision process a bit more weight-based, will probably continue tweaking later.
Makes the admin debug UI have links to change settings easily.
Adds replacement for grid check event, which works similar to the old one, but is now based on a physical machine in the game world, that Engineering can hack to make the event end faster, if so desired.  Note that the machine is not mapped in, and won't be mapped in until the event system is ready for launch.
Adds grid_check variables to SMESes and APCs to make them stop doing work without draining the battery.
Grid checks in the new system are caused by a "power spike" which originates from the engine and will cause bad things, should no grid checker machine be connected to the power-net.  These power spikes occur when the GM decides that a grid check is a good event to have.
The grid checker can be built and deconstructed using the standard machine construction methods.
2016-10-05 21:40:07 -04:00
Spades
c2dba72caf Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into jukebox-v2 2016-10-04 16:06:18 -04:00
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