Neerti
9c0ac5ec2a
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/20/2017_syndie_borgs_are_back
2017-10-20 13:26:06 -04:00
Neerti
1aff3fc8c0
Syndicate Borgs II, Return of the Salt
...
Adds an option in mercenary uplinks to purchase three different 'classes' of drones.
See PR for more details.
2017-10-20 13:01:45 -04:00
Mechoid
920e823a46
Fuel-Rod Gun, Minor fixes related. ( #4103 )
...
* A whole load of things.
* Fixes the SM Rod's travel distance.
2017-10-19 15:07:52 -05:00
LorenLuke
f3b2ddd80c
Fixes typo.
2017-08-05 15:28:42 -07:00
LorenLuke
36b0d0bfcc
Allows team traitor and uato traitor to order AM rifle.
2017-08-05 15:06:20 -07:00
LorenLuke
2f481de07d
Bugfix.
2017-07-30 22:51:03 -07:00
LorenLuke
31e90bfeed
Adds Collapsible AM rifle. Createes new uplink entry ( #3644 )
...
* Adds Collapsible AM rifle, and adds case with parts and 5 shots to Uplink. Separates it and intended merc version, both costing default telecrystal amount. Does NOT make them antagonist type specific.
* Addresses review.
* Makes rifle case traitor/merc specific. Enables ability to have specific uplink items be available only for specific antags.
2017-07-28 16:06:20 -05:00
Anewbe
c3945440c6
Adds monkey cubes to the traitor uplink
2017-07-25 17:55:02 -05:00
Anewbe
f0d9bb5dce
Adds the weapon swaps to the uplink
2017-07-22 15:01:18 -05:00
Spades
2e776ac645
Changes 5.56mm to 5.45mm, now 20% less stupid
...
The same as https://github.com/PolarisSS13/Polaris/pull/3612 except this
time I'm not a dumbass and accidentally overwriting other changes
because the Github client decided not to sync with Polaris.
2017-07-19 14:24:50 -04:00
Neerti
bc40a45cc4
Adds Radio Jammers to Traitor Uplink
...
Subspace Jammers can be bought in the traitor uplink for 25 TC. They are already in the code, but this PR adds them to the uplink.
This PR also adds a power meter to the sprite, as a small QoL change.
They run off of weapon cells and one cell will last for about a minute.
2017-07-06 21:20:10 -04:00
Neerti
37cd5f8aec
Fixes uplink duplicate path.
2017-07-06 11:55:36 -04:00
Neerti
005ef28f13
Adds the Anti-Surveillance Tool for Traitors.
...
Adds a traitor device to warn the traitor if they're being spied or are about to be spied on by the AI or anyone using a camera console.
It will warn the holder by changing color, beeping a specific tone, and sending a message to their chat log. It only does this when the state of spying changes, so it will not spam the chatlog if nothing changes. Only the holder can hear the warnings. It also functions like a regular multitool.
2017-07-05 21:18:52 -04:00
Spades
3ff9d441f9
Finishes fixing ammo inconsistencies
2017-05-27 04:39:49 -04:00
Spades
8579adcc53
Naming convention of ammo is now consistent
...
s = Speedloaders. (Functionally the same as clips, but they're not
_really_ the same thing, just in case we change these later.)
c = Clips. (Can also be used to fill other magazines.)
m = Magazine. (Holds ammo rounds.)
a = Ammo. (Individual rounds of ammo.)
2017-05-26 19:32:23 -04:00
MagmaRam
2a42f9ef55
Merge pull request #3405 from Anewbe/bullet_swap
...
Makes the 556 and 762 calibers more appropriate to their naming
2017-05-21 13:17:58 -05:00
Anewbe
58b9c63ec2
Makes the 556 and 762 calibers more appropriate to their naming
2017-05-01 20:25:43 -05:00
Yoshax
03ff489f7a
Kinda reworks Hyposprays/Autoinjectors
2017-04-30 17:13:00 +01:00
Anewbe
e17eccae93
Adds ion pistol to uplink, allows holstering
2017-04-20 20:04:21 -05:00
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
