killer653
2755d3ddb1
HOTFIX
2017-09-21 20:26:48 -04:00
Belsima
c67865ac63
Adds a load of new FBPs. ( #3850 )
...
* Adds a load of new FBPs.
* Replaces cyber solutions sprites.
* Fixes and price adjustments.
* Revert "Fixes and price adjustments."
This reverts commit d56c3f082e9301b80970f62aa9d0cb3e8cfc6d8f.
* Fixes + supply price adjustments.
This time without... for some reason adding an empty line to the map
files. Not sure how that got caught by Git.
* Makes the new knockoffs into alternatives for the currently existing brands.
* new names
2017-09-20 22:02:18 -05:00
Cyantime
52c3f014c1
Deconflicts2
2017-09-16 19:03:28 -04:00
Cyantime
68056dd5f2
Deconflict
2017-09-16 19:00:30 -04:00
Spades
1115d2d566
Merge pull request #2166 from Neopatra/Neopatra-Taursuits
...
Neopatra's taursuits
2017-09-16 18:56:45 -04:00
Neopatra
df1a318319
Adds taur suit to the rad suit crate
...
I forgot to do this. I have no longer forgotten as it is here.
2017-09-16 17:19:17 -04:00
Neopatra
db9b91354e
Adds Taur Biosuits to Medical Biosuit Crate
...
Also this crate is an absolute mess can we split it into like, 2 or 3 crates at a later date? Also aware that the general suit sprite isn't 100% correct, but I figured consistency was better until I finish all of the suits (They don't have different names in game so its not very noticeable).
2017-09-16 13:13:03 -04:00
Neopatra
f9392153e5
Adds Taur Biosuit to Security Biosuit Crate
2017-09-16 13:07:36 -04:00
Neopatra
dbefe23039
Adds Taur Voidsuits to Relevant Supply Packs
2017-09-16 13:06:10 -04:00
killer653
bddfa16f82
Polaris sync
2017-09-15 21:17:34 -04:00
Belsima
fb0e4d3cf9
General uniform updates. ( #3814 )
...
* General uniform update.
* Maps in bathrobe.
* Revert "Maps in bathrobe."
This reverts commit 9cbe47671da7a452cb5ac040aeefdcb98dbe180a.
* Fixes cheongsams and maps in the bath robe.
* Removes unintentionally added sprite.
* Assorted bugfixes.
2017-09-15 17:14:20 -05:00
Cyantime
965626656b
Deconflicts
2017-09-15 15:27:12 -04:00
Cyantime
562d8539af
Adds thermal regulators.
2017-09-15 15:23:26 -04:00
killer653
6297180aa5
Adds rahboopred sprites
2017-09-10 19:51:41 -04:00
Neerti
8f00965cc2
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 8/10/2017_make_xenobio_old_again
...
# Conflicts fixed:
# code/modules/admin/topic.dm
# code/modules/admin/verbs/debug.dm
# code/modules/admin/view_variables/helpers.dm
# code/modules/mob/living/simple_animal/simple_animal.dm
# code/modules/mob/transform_procs.dm
# maps/northern_star/polaris-1.dmm
# polaris.dme
2017-09-05 00:58:27 -04:00
Neerti
4bfcec55f2
work
2017-09-04 21:52:47 -04:00
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
