Commit Graph

1557 Commits

Author SHA1 Message Date
Cameron653
ea41796e2c Update supply.dm 2017-09-02 20:04:18 -04:00
Cameron653
fab106fd18 Update recreation_vr.dm 2017-09-02 14:12:10 -04:00
Cameron653
f6033bb7d7 Update science_vr.dm 2017-09-02 14:11:43 -04:00
killer653
cafac8efae Polaris Sync 2017-08-28 20:52:11 -04:00
Ketrai
7055489f58 Fixes more indentation errors
T_T
2017-08-28 22:56:57 +02:00
Ketrai
c2dd08a0c8 Welcome to the mess that's my copy and paste 2017-08-28 22:41:34 +02:00
Ketrai
b6a288fcf4 Adds 4 new crates for 4 new monkey cubes
Basically the same as the pull I did a moment ago.
2017-08-28 21:33:42 +02:00
Spades
18ffeefafd Removies oties and outdoors area 2017-08-26 15:51:37 -04:00
Belsima
7665588e4e Adds a tiedye shirt. 2017-08-23 03:38:48 -04:00
MagmaRam
1546b25f4c Merge pull request #3698 from Belsima/fbps
Adds Grayson Manufactories FBPs.
2017-08-20 21:27:50 -06:00
Anewbe
676fb6daf6 Merge pull request #3694 from SpadesNeil/gun-stuff
Gun stuff. Some fixes, some changes, and a shiny new SVD
2017-08-20 11:21:50 -04:00
Neerti
e209c2c707 Merge pull request #3717 from Cyantime/cheaperteg
Reduces TEG price.
2017-08-17 11:52:29 -04:00
Cyantime
80ec86a07c Reduces TEG price. 2017-08-16 10:50:10 -04:00
killer653
dc828eaab0 Spiders! 2017-08-12 23:02:38 -04:00
Belsima
31f9127cf9 Adds Grayson Manufactories FBPs. 2017-08-10 14:38:33 -04:00
Spades
6b02206adf Sniper Changes and Fixes
- Fixes the heavy sniper hand sprite so it no longer looks like a
pistol. Not ideal, but better.
- Changes energy sniper to use the Z8's hand sprite, because it's more
distinct than looking the same as the laser carbine.
- Adds the SVD back by request of Woodrat. It's not spawnable yet, since
I don't know where you want to balance it.
2017-08-09 21:04:58 -04:00
killer653
fc7d06493c Updates map, updates ammo. 2017-08-06 20:36:37 -04:00
killer653
468e73c7f3 Polaris sync 2017-08-06 19:07:17 -04:00
Neerti
01856579d1 Merge pull request #3681 from LorenLuke/Antag-fix
Allows team traitor and autotraitor to order AM rifle.
2017-08-05 19:39:31 -04: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
Anewbe
1a7d47fc6b Merge pull request #3676 from Neerti/8/3/2017_tool_update
Updates Tools
2017-08-04 14:05:06 -05:00
Neerti
4256ec902a Changes path of alien tools, adds hacking sounds, and makes the fireaxe cabinet use toolspeed. 2017-08-04 08:35:16 -04:00
Neerti
b2f5b758f1 Hopefully fixes merge conflicts. 2017-08-01 16:18:43 -04:00
Neerti
36b0f5fa99 Even More Circuit Changes
See PR for changes.
2017-08-01 16:13:27 -04:00
LorenLuke
2f481de07d Bugfix. 2017-07-30 22:51:03 -07:00
silveryferret
786c21c66e Fixes build_path variable, tweaks required components for R-UST parts, adds supply packs for R-UST things 2017-07-29 05:26:07 -04: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
MagmaRam
ded94ef66c Merge pull request #3643 from Anewbe/monkey_cubes
Adds monkey cubes to the traitor uplink
2017-07-28 15:18:30 -05:00
Cameron653
97957fcaee Replaces more macros. (#3647)
* MORE MACRO CHANGES

AHHHHHHHHHHHHHHHHHHHH

* Fixes a few typos

* Fixes compile error

* Fixes for real

* 4 macros left that I can't find
2017-07-27 21:12:21 -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
Anewbe
ab5e716624 Merge pull request #3617 from SpadesNeil/centcom-not-centcomm
CentCom not centcomm
2017-07-22 13:30:06 -05:00
Spades
7e4417d31f It's CentCOM not CentCOMM
I swear to god I have fixed this like three times already and somehow it
keeps coming back.
2017-07-21 04:29:39 -04: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
Anewbe
27284d3687 Merge pull request #3577 from Anewbe/shotgun_fix
Fixes slugs being available in an unhacked autolathe
2017-07-12 23:17:54 -05:00
Anewbe
be8c644e07 Merge pull request #3565 from Neerti/7/6/2017_jammers
Adds Radio Jammers to Traitor Uplink
2017-07-09 16:15:42 -05:00
Anewbe
e6d949c049 Fixes slugs being available in an unhacked autolathe 2017-07-09 15:43:17 -05:00
Andromeda-K22
760dce00fa Shotgun additions and minor tweaks (#3554)
* 24-round shotgun mag fixes + making it relevant.

Adds the AS-24 Shotgun to the traitor uplink for 100 TCs, also makes automatic shotgun magazines costs the appropriate amount (13,000 metal up from 2200)

* Magazine variety.

Nothing really new here. Beanbag / pellet mags for the admin-only AS-24.

* shotgun 6-shell clips, autolathe and shotgun tweaks.

+6-shell quickloader clips for shotguns, with proper metal costs for slugs, beanbags and buckshot.

+minor tweak to shotguns to allow the quickloaders to work in a non-silly way (load_method = SINGLE_CASING|SPEEDLOADER) since there are literally no other shotgun speedloaders this probably shouldn't be an issue (as it's ever so slightly quicker than loading with a box)

+added sprites for quickloading clips.

* Requested changes.

-6 round shotgun clip sprites
+4 round shotgun clip sprites
-/+ adjusted shotgun clips to 4 rounds

* cherrypicking

* fixes

did a bad

* literally a number
2017-07-07 15:12:32 -05:00
Verkister
45cf4a5d43 Missed file addition. 2017-07-07 18:30:03 +03:00
Verkister
6a633f6c51 More otie stuff.
-Took out the minimum oxygen requirement from space oties. They all died outside as oxygen was not one of the gases there.
-Moved guard otie to security category in cargo.
-Moved the collared otie from pred crate to its own crate. Bare one is still in the pred crate chances.
-
2017-07-07 17:07:15 +03: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
Andrew
378bb4af49 Readds Jumper Cable Kits
+Readds jumper cable kits to revive FBPs (Robotics will spawn with these
without any map changes but they will be empty so that needs to be fixed
anyways)
+Readds jumper cable kits to cargo orders
-Lowers jumper cable kits in order to 2 from 4 to be in line with the
defibrillator changes
+Adds robot defibrillators to both medical modules
+Adds robot jumper cables to research module
+Adds some new icons for jumper cables to fit in better with the new
defibrillator sprites
2017-07-03 18:33:48 -05:00
Spades
08704251b2 Merge pull request #1793 from VOREStation/guns
Dakka Dakka
2017-07-02 02:29:46 -04:00
Spades
36f32b1ab6 Merge pull request #1756 from Verkister/cargoandborgo
Cargo and borgo stuffs. [change check a whole week overdue!]
2017-07-02 02:20:25 -04:00
Spades
2f9c8b48b4 Merge remote-tracking branch 'refs/remotes/origin/master' into guns 2017-07-02 00:30:23 -04:00
Spades
3db35eb684 Dakka Dakka
- Removed gun_vr judge, Polaris has one now.
- Removed vorestation m44 mags, Polaris has those now.
- Removed detective's .44 magnum because NO YOU CANNOT HAVE A FUCKING
MAGNUM
- Corrected inconsistent naming of .44 speedloaders
- Corrected inconsistent naming of .357 speedloaders
- Fixed broken calibers for .357 stuff to be consistent with upcoming
Polaris sync.
2017-06-30 22:42:08 -04:00
Leshana
18b1828631 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170630 2017-06-30 22:31:43 -04:00