Commit Graph
2009 Commits
Author SHA1 Message Date
MagmaRam 190a2bc70c Replaces [stack]/fifty atoms with atoms that spawn the normal stack
The stack/fifty objects were really buggy, this should fix all of that in one go.
2016-12-17 17:27:04 -06:00
MagmaRam d3be058c5d Adds a crate with defibrilators for 30 points 2016-12-17 09:46:05 -06:00
Neerti 68b1a3e355 Vending machines now correctly throw products 2016-12-17 03:30:14 -05:00
ForFoxSake 451f48e621 Enable overriding of the underwear icon file. 2016-12-09 13:30:38 +00:00
woodratt 454e6870d9 1.6.3 Ports of Bay's suit clothing
- Whole scale port of clothing items from bay.
- Solgov armor vests, as well as a 'tactical vest' (None avail. in game)
- Alternate atmos, engineering, mining, medical, and security suits. (Due to their stats, only available through cargo).
- Three new hazard vest colors, blue, green, white. (Load out option)
- 'Service jackets' Black and Green (Load out option).
- Solgov fleet dress uniforms, surgical apron, marshal jacket (None avail. in game, may change with the surgical apron in the future.)
- As a side change the Construction, HAZMAT, Biohazard, and EMT voidsuits are also now available from cargo. HAZMAT and Biohzard come with slightly adjusted stats to sort of reflect what they are designed for.
2016-11-24 19:19:26 -08:00
AnewbeandGitHub 5397b162c8 Merge pull request #2777 from SpadesNeil/crate-fix
Fixes stupid naming of weapon crates
2016-11-19 12:03:00 -06:00
SpadesandGitHub fbfeba71c3 Fixed 2016-11-19 12:34:42 -05:00
Spades 5bf58cda40 Fixes stupid naming of laser weapons crate
This was confusing and dumb. Now it's not.
2016-11-19 11:39:41 -05:00
AnewbeandGitHub 7d532f573e Merge pull request #2751 from Kholdstare34/outbox
Clothing additions, minor clothing tweaks, and undershirts
2016-11-16 17:29:36 -06:00
Anewbe be4aa63263 AP bullets 2016-11-15 19:50:28 -06:00
Kholdstare34 f37251496e Adds several feminine undershirts, tweaks the warden and HoS jumpskirt to bring them in line with the other departmental jumpskirts, and adds white short shorts and a denim skirt. 2016-11-15 19:08:27 -06:00
Anewbe 189a9a4329 Brand disks now come in their own crates, prices increased 2016-11-13 16:03:03 -06:00
Anewbe 940ecb2b80 Surplus crates will no longer make more surplus crates 2016-11-07 21:07:57 -06:00
NeertiandGitHub 7dadc5f6f9 Merge pull request #2658 from Anewbe/waistcoat
Waistcoats are accessories
2016-10-24 19:33:12 -04:00
Anewbe 510cf17723 Waistcoats are accessories 2016-10-19 22:29:22 -05:00
PapaDrow 560edb9687 Adds striped underoos in the same pattern as the striped socks, as it says on the tin. Should support recolouring. 2016-10-19 18:36:56 -04:00
Anewbe ced74308e9 Fixes some Cargo crate issues 2016-10-16 13:21:05 -05:00
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
AnewbeandGitHub 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
AnewbeandGitHub 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
AnewbeandGitHub 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
YoshaxandGitHub 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
EmperorJonandGitHub 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