Commit Graph

37 Commits

Author SHA1 Message Date
Anewbe
40617b7695 Package bomb changes 2017-04-04 22:36:08 -05:00
MagmaRam
33dffeb0b8 Merge pull request #2955 from Anewbe/heart_damage
Big Ol' Medical Tweaks
2017-03-28 20:02:24 -05:00
Anewbe
3ba498fc47 Fixes the fake command report 2017-03-24 22:57:09 -05:00
Anewbe
2c9c3e208e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/giant_spider.dm
#	code/modules/organs/blood.dm
#	code/modules/organs/internal/lungs.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_external.dm
2017-03-22 17:29:01 -05:00
Neerti
d5438dc36d Fixes two bugs. 2017-03-03 10:09:45 -05:00
Anewbe
3833a404c7 Antag announcement papertrail 2017-02-05 01:13:07 -06:00
Anewbe
83db0cc38f Medical tweaks 2017-01-23 23:43:44 -06:00
Anewbe
be4aa63263 AP bullets 2016-11-15 19:50:28 -06:00
Anewbe
940ecb2b80 Surplus crates will no longer make more surplus crates 2016-11-07 21:07:57 -06:00
Anewbe
771d8b9e4b Adds a smaller device cell for use in non-weapon devices 2016-10-08 15:34:18 -05:00
Anewbe
0f51fda83a Energy weapons can be reloaded 2016-10-06 21:30:52 -05:00
Anewbe
0d0322b93c Adjusts shotgun ammo box contents 2016-10-03 21:48:16 -05: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
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
Yoshax
9f2ffa9c03 Corrects an uplink item path 2016-07-25 14:39:43 +01: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
21f856ed47 Multiplies all Telecrystal stuff by ten to setup for fine cost adjusting 2016-07-22 17:35:20 +01:00
Anewbe
1f4ca8dbd0 Removes Assault Carbine from uplink 2016-07-10 04:14:42 -05:00
Spades
e51da6c35b Renamed SVD mag to be consistent per request.
It's just a 10 round 762 magazine. It's compatible with the STS.
2016-06-06 22:03:03 -04:00
Spades
a063c8915e Feedback based on meeting.
- Removed carbine from the cargo.
- Removed SVD.
- Removed FiveSeven. Added sprite to gun resprites.
2016-06-03 20:21:12 -04:00
Spades
dd0c3935e7 Gun lore updates.
Also changed the path of the bullpup rifle.
2016-06-03 10:33:04 -04:00
Spades
c6b650afa5 Changed some new gun names based on feedback.
People prefer fantasy names for modern guns! Left names like the Mosin
and Tommygun because they're too ironic to change, even in the 26th
century.
2016-06-02 17:16:21 -04:00
Spades
ff87150c3d Let's just have the one commit this time because I'm no longer paranoid of losing progress. 2016-06-01 12:48:48 -04:00
Yoshax
50393fa2a7 Fixes combat medical kit being unbuyable 2016-05-19 18:19:43 +01:00
Yoshax
718b249b1d Uplink changes and additions (#1645)
* Splits uplink categories into separate files and moves other files around

* Corrects an incorrect description

* Puts uplink categories in uplink_categories into the same order as they are individual files

* Mercenaries now spawn with their own private uplink.

* Adds a random discount to uplink items that is applied every 15 minutes

no message

no message

* Adds changelog

* Fakes announcements are now once again purchasable from the uplink and actually work

* Removes a debug line

* Adds several existing items to the antag uplink including stun rounds for shotguns, metal foam grenades and more

* Refactors boxes.dm to use absolute pathing and for loops for contents

Adds changelog
2016-05-15 18:31:34 -04:00