Neerti
cc616148e3
Merge pull request #4291 from mistyLuminescence/FisforFriendswhoDoStuffTogether
...
Adds bracelets!
2017-11-21 01:32:35 -05:00
Neerti
2ac5947707
Merge pull request #4306 from Anewbe/prosfab_organs
...
Adjusts ProsFab and MechFab design menus
2017-11-21 01:30:38 -05:00
Anewbe
fea8fcc064
Merge pull request #4310 from Neerti/11/19/2017_hunting_rounds
...
Adds Hunting Rounds
2017-11-21 00:29:12 -06:00
Anewbe
4739f04c5d
Merge pull request #4308 from SpadesNeil/shotgun-clip-rebalance
...
Shotgun clip rebalance
2017-11-21 00:18:01 -06:00
Neerti
a5d3f92a28
Merge pull request #4316 from Cameron653/patch-1
...
Fixes a bug with allowmodification verb
2017-11-21 01:17:19 -05:00
Cameron653
ce87bc349c
Fixes a bug with allowmodification verb
2017-11-20 20:51:27 -05:00
Marina Gryphon
2489497f81
Maybe fixes #4220 .
2017-11-20 18:42:05 -06:00
Cameron653
faf275e202
Fixes pAI access
...
fixes https://github.com/VOREStation/VOREStation/issues/2504
2017-11-20 12:54:10 -05:00
Neerti
9db34eae86
Adds Hunting Rounds
...
Adds a system for projectiles to inflict additional damage on specific kinds of simple animals.
Adds special bullets for certain rifles which are very effective against 'animal' SAs such as giant spiders, bears, carp, and such. The bullets do less damage to other targets such as humanoids.
Replaces the southern cross gun locker regular ammo with hunting ammo.
2017-11-19 23:59:17 -05:00
Neerti
d36d09d937
Merge pull request #4176 from Anewbe/battery_things
...
Swaps non-mounted recharging guns to batteries
2017-11-19 21:28:06 -05:00
Anewbe
418dda15dc
Merge pull request #4148 from mistyLuminescence/fbphud
...
MedHUDs can identify FBPs
2017-11-19 17:40:03 -06:00
Anewbe
1fb2e32e2f
Merge pull request #4297 from Neerti/11/18/2017_make_syndie_toolboxes_special_again
...
Makes Syndie Toolboxes Special Again
2017-11-19 17:25:44 -06:00
Neerti
d8b26358ce
Merge pull request #4278 from Anewbe/defib_charge
...
Successful Defibs are more costly, chargewise.
2017-11-19 17:50:13 -05:00
Neerti
595f874f9b
Merge pull request #4264 from Anewbe/decap_defib
...
Decapitation now stops defibrillation
2017-11-19 17:50:03 -05:00
Anewbe
e280abb58b
Merge pull request #4307 from Neerti/11/19/2017_submap_validation
...
Allows Travis to Validate PoI Maps
2017-11-19 15:49:02 -06:00
Belsima
b72cc54580
Meatspike fixes. ( #4299 )
...
* Various fixes.
* Appeases the travis god by properly using isMonkey.
* Skips out on helpers entirely.
* Adds a parantheses.
I ruin commit histories just by glancing at them.
2017-11-19 14:42:37 -06:00
Anewbe
7d6332a845
Plantmonkey expansion. ( #4300 )
...
* Update diona_attacks.dm
* Diona nymphs can now wander on their own.
* So Dionae can actually wander.
2017-11-19 14:42:20 -06:00
Anewbe
a99102de94
Merge pull request #4305 from Cameron653/TESHARI_STUFF
...
Fixes a few borked teshari cloaks & uniforms
2017-11-19 14:41:52 -06:00
Spades
79d3ee82ab
Shotgun clip rebalance
...
An alternative solution to the problem I highlighted in
https://github.com/PolarisSS13/Polaris/pull/4302
If this is merged, **do not merge**
https://github.com/PolarisSS13/Polaris/pull/4303
2017-11-19 14:08:03 -05:00
Neerti
73cb87c3a5
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 11/19/2017_submap_validation
...
# Conflicts resolved:
# code/unit_tests/map_tests.dm
2017-11-19 06:09:01 -05:00
Neerti
396f55fb17
Allows Travis to Validate PoI Maps
...
Tweaks Travis to compile all PoI maps in order to allow the compiler to find certain problems such as missing paths. This is needed because PoIs are loaded at runtime as opposed to being compiled like traditional maps, making them a bit prone to problems. Travis should help find those problems before they reach the live server by failing PRs which add a broken PoI map or break any existing PoI maps.
For regular use, the PoIs will not be compiled unless done so manually by the developer.
2017-11-19 06:07:41 -05:00
Anewbe
0da9a42517
Adjusts ProsFab and MechFab design menus
2017-11-19 04:25:36 -06:00
Belsima
3320690a1e
I before E ( #4287 )
...
* except after C
* maroonic mistake
* Improved use of sound files.
Also more grammar.
* now with less fuckup
2017-11-19 03:00:14 -06:00
Neerti
9eeacdfb48
Merge pull request #4211 from Anewbe/ling-cuff-slip
...
Adds a ling ability to slip cuffs
2017-11-19 03:54:50 -05:00
Neerti
5846f412ac
Merge pull request #4290 from Anewbe/voxbeam
...
Tones down the Darkmatter Beam
2017-11-19 03:54:02 -05:00
Belsima
594625cf81
Adds force to a pair of items that were lacking for some reason, and standardizes light replacer file. ( #4280 )
...
* Adds force to lamps.
* Standardization.
* Standardizes a few things.
* Grammar that I missed.
* Some more missed grammar.
2017-11-19 02:52:56 -06:00
Anewbe
4b9369971b
Merge pull request #4275 from Cyantime/patch-1
...
Allows constructed full window to smooth with mapped windows
2017-11-19 02:51:48 -06:00
Anewbe
621775a423
More absolute pathing
2017-11-19 02:49:44 -06:00
Anewbe
fd7990028f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into battery_things
2017-11-19 02:38:42 -06:00
Anewbe
61cb829dc1
Adds an actual icon for Escape Restraints
2017-11-19 02:34:40 -06:00
Anewbe
c043bc3f02
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into ling-cuff-slip
2017-11-19 01:58:06 -06:00
Anewbe
ef78afc1d6
Merge pull request #4295 from Mechoid/Prometheans-2-Boogaloo
...
Allows Prometheans to mimic the appearance of Vatborn.
2017-11-19 01:45:11 -06:00
Neerti
07950e93a0
Merge pull request #4301 from PolarisSS13/revert-4292-NOV17MAP_TEST
...
Revert "Switches us to the Southern Cross for testing"
2017-11-19 01:32:01 -05:00
killer653
9f067a375b
Fixes a few borked teshari cloaks
2017-11-19 00:09:45 -05:00
Woodratt
2684942049
Map fixes
...
Multiple Map Issue Fixes
2017-11-18 19:17:48 -08:00
Anewbe
e6d263a8fa
Revert "Switches us to the Southern Cross for testing"
2017-11-18 14:26:28 -06:00
Anewbe
a6aa1e0c51
Merge pull request #4292 from Anewbe/NOV17MAP_TEST
...
Switches us to the Southern Cross for testing
2017-11-18 14:26:23 -06:00
Belsima
2a4e0a0fb7
So Dionae can actually wander.
2017-11-18 14:02:21 -05:00
Belsima
e1458c5df2
Diona nymphs can now wander on their own.
2017-11-18 14:01:30 -05:00
Belsima
e5e102790a
Update diona_attacks.dm
2017-11-18 13:59:57 -05:00
Anewbe
77db846f44
Merge pull request #4279 from Verkister/jobslot
...
Fixes one player being able to hog every slot of a job alone.
2017-11-18 12:03:28 -06:00
Anewbe
3d15d309fd
Merge pull request #4286 from Nalarac/Morgue
...
Allows Cyborgs to Use Morgue Trays
2017-11-18 12:02:52 -06:00
mistyLuminescence
b1bfea36dc
Friendships are no longer priceless
2017-11-18 17:55:35 +00:00
Neerti
4263a9b70b
Makes Syndie Toolboxes Special Again
...
The syndie toolboxes have been split into two versions, one with the old contents pre-powertools and one with the current powertools. Both are in the uplink, however only the regular tool version of the syndie toolbox can be found in maint now. This is to make power tools less commom, as there are several spots where syndie toolboxes are guaranteed to spawn at, and it made the CE's tools less special.
2017-11-18 08:06:38 -05:00
Mechoid
c8b837afdc
Allows Prometheans to mimic the appearance of Vatborn.
2017-11-18 01:27:35 -08:00
Anewbe
2e01a55278
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NOV17MAP_TEST
2017-11-18 02:13:23 -06:00
Anewbe
d730cc2d88
Merge pull request #4293 from Neerti/11/18/2017_travis_offering
...
Adds ability to exempt areas from unit tests on a per-map basis
2017-11-18 01:59:50 -06:00
Neerti
2567e4e3d1
Adds ability to exempt areas from unit tests on a per-map basis
2017-11-18 02:38:58 -05:00
Anewbe
3e3af4c137
Switches us to the Southern Cross for testing
2017-11-17 23:30:47 -06:00
mistyLuminescence
fc6ef8e921
Fixes hand sprites
2017-11-18 02:42:55 +00:00
