Neerti
770f3d4ab5
Merge pull request #3290 from Anewbe/antag_infections
...
Ling and Technomancer now have ways to cure infections
2017-04-14 01:02:11 -04:00
Anewbe
4cf38d9037
Should fix throwing people.
2017-04-13 23:38:16 -05:00
Anewbe
25ea0ed33d
Diona should regrow faces now
2017-04-13 22:48:10 -05:00
LorenLuke
452f1fad9b
Merge branch 'master' into Grab-Throw-Fix
2017-04-13 19:29:40 -07:00
LorenLuke
a0eecc9f45
Fixes grabs not being able to throw (sorry... :c )
2017-04-13 19:28:10 -07:00
Neerti
c84ab67fd3
Changes Shields
...
See PR for details
2017-04-13 00:36:13 -04:00
Leshana
d00c2596e8
Restores "soft" darksight vision.
...
The previous client-side optimization made lighting overlays go fully
opaque when it was dark, making it so species darksight didn't let you see
anything. This fixes that by making a dark_soft icon state that has
opacity matching the LIGHTING_SOFT_THRESHOLD.
2017-04-12 21:43:07 -04:00
Anewbe
d1657e23c2
Ling and Technomancer now have ways to cure infections
2017-04-12 19:15:32 -05:00
Leshana
5f629e2aca
Optimizes lighting overlays for slow clients.
...
Ports https://github.com/tgstation/tgstation/pull/25778 and https://github.com/tgstation/tgstation/pull/25861
* Instead of using color matrix for all overlays, fully dark and fully light use static black and transparant icon states without color matrix.
* Also implements LIGHTING_ROUND_VALUE so that lighting values actually will reach 0 or 1.
2017-04-12 19:12:06 -04:00
Leshana
f2956464b8
Replace direct access of lighting overlays with T.get_lumcount()
2017-04-12 19:11:53 -04:00
Leshana
e8af4afc88
Port tg/paradise/good soft-edge lighting
...
Ports https://github.com/ParadiseSS13/Paradise/pull/6161
Its merged in nearly verbatim as far as the lighting module goes.
Changes outside the lighting module are merged based on our codebase.
2017-04-12 19:11:45 -04:00
Neerti
88e38117d9
Merge pull request #3016 from Anewbe/weapon_dulling
...
Material Weapon rework
2017-04-12 18:08:04 -04:00
Anewbe
077fa19920
Merge pull request #3285 from Anewbe/aviator_fix
...
Fixes aviator SecHUDS
2017-04-12 16:52:46 -05:00
Anewbe
771063f7a7
Merge pull request #3270 from SinTwo/tablefix
...
Table Fix
2017-04-12 16:40:54 -05:00
Anewbe
21d833746d
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into weapon_dulling
2017-04-12 16:10:58 -05:00
Cerebulon
18de8caf6a
Adds two side swept versions of the Undercut haircut
...
Also removes a couple of unnecessary comments from the file.
2017-04-12 21:13:59 +01:00
Anewbe
746e98a012
Hardhat tweaks
2017-04-11 23:09:43 -05:00
Leshana
45058136e2
Replace opacity = X with set_opacity(X) so that the lighting system can update propertly.
2017-04-11 22:36:48 -04:00
Anewbe
60fa2839e7
Fixes aviator SecHUDS
2017-04-11 21:20:48 -05:00
Neerti
75cc189723
Merge pull request #3271 from VOREStation/aro-pol-panic
...
Quick & Dirty Panic Bunker Port
2017-04-11 21:55:59 -04:00
Neerti
ac12cfc33f
Merge pull request #3283 from Anewbe/ninja_drugs
...
Ninja rig has different chems
2017-04-11 21:52:58 -04:00
Neerti
d0d19af7c5
Merge pull request #3284 from Anewbe/brainloss
...
Lessens brainloss from oxyloss
2017-04-11 21:52:27 -04:00
Anewbe
56292c6c5f
Merge pull request #3260 from VOREStation/aro-pol-spawnverb
...
Fix 'Spawn Character' DNA
2017-04-11 20:50:45 -05:00
Anewbe
03c0ebf490
Lessens brainloss from oxyloss
2017-04-11 20:42:17 -05:00
Anewbe
4085e28285
Ninja rig has different chems
2017-04-11 20:34:11 -05:00
Arokha Sieyes
ebb2bf9675
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync2
2017-04-11 21:29:07 -04:00
Anewbe
2c1a748650
Merge pull request #3274 from LorenLuke/Grabs
...
Resisting out of choking grabs isn't 100% guaranteed anymore.
2017-04-11 18:11:11 -05:00
ArbyTheDragon
82005ff9c1
Tending to OCD by capitalizing 'carthatoline'
...
Pow. It's gonna be changed.
2017-04-11 15:22:53 -05:00
Arokha Sieyes
b7618caae9
Merge pull request #1384 from VOREStation/aro-wetfish
...
Allows Akula to breathe underwater
2017-04-11 16:17:04 -04:00
Anewbe
8a2c84eba3
Weakens bloodloss from burn damage
2017-04-11 12:28:48 -05:00
LorenLuke
faf85774b5
Resisting out of choking grabs isn't 100% guaranteed anymore. Tweaked some ling checks to compensate.
2017-04-11 01:16:03 -07:00
LorenLuke
69a8d84344
Fixes a few errors.
2017-04-11 00:39:21 -07:00
LorenLuke
cebbac32e8
Allows usage of ctrl+numpad for target zone selecting.
2017-04-11 00:25:29 -07:00
Arokha Sieyes
0e447f6f2c
Allows Akula to breathe underwater
...
SHERKS. Sherk sherk. Sherk in a sherk splash. Sherk splash in a sherk pool.
2017-04-11 00:50:51 -04:00
Arokha Sieyes
42998da918
Fix 'if' statement on Panic Bunker
...
Prints error message when it doesn't need to and works fine. Also moves check up slightly to prevent an exploit.
2017-04-11 00:13:54 -04:00
Arokha Sieyes
66327aecc7
Quick & Dirty Panic Bunker Port
...
Tested on our server, works. Doesn't work if you don't have a DB (how would it?).
2017-04-11 00:13:43 -04:00
Arokha Sieyes
ba1221889c
Fix 'if' statement on Panic Bunker
...
Prints error message when it doesn't need to and works fine. Also moves check up slightly to prevent an exploit.
2017-04-11 00:12:32 -04:00
SinTwo
afb6f1b572
Fixes : #3268
2017-04-10 23:32:38 -04:00
Arokha Sieyes
b3d652fa50
Quick & Dirty Panic Bunker Port
...
Should work! Should.
2017-04-10 22:38:58 -04:00
Arokha Sieyes
dc22050140
Loadout path fix
2017-04-10 20:55:24 -04:00
Arokha Sieyes
e7d8af7ae7
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
...
# Conflicts:
# code/modules/client/preference_setup/loadout/loadout_xeno.dm
# code/modules/mob/mob.dm
# html/changelogs/.all_changelog.yml
2017-04-10 20:41:18 -04:00
Arokha Sieyes
49f0661d36
Merge pull request #1377 from VOREStation/aro-doafter
...
Prevent ranged dogborg noms
2017-04-10 20:31:04 -04:00
Arokha Sieyes
bf1f407e14
Merge pull request #1376 from VOREStation/actually-fix-holocarp
...
Actually make holocarp not delete you when derezzing.
2017-04-10 20:30:58 -04:00
Arokha Sieyes
469d542058
Merge pull request #1375 from VOREStation/aro-adminspawn
...
Fix 'Spawn Character' DNA
2017-04-10 20:30:31 -04:00
Arokha Sieyes
2479f3af98
Merge pull request #1374 from VOREStation/aro-defaultskin
...
Fix some default species spawn colors
2017-04-10 20:30:02 -04:00
Arokha Sieyes
8092a35af3
Merge pull request #1373 from VOREStation/aro-subsleeve
...
Adds 'Subsleeving' into prey
2017-04-10 20:29:51 -04:00
Arokha Sieyes
e236c33576
Merge pull request #1372 from VOREStation/aro-synthtails
...
Fix up a few synth issues
2017-04-10 20:29:21 -04:00
Anewbe
d9235883ff
Rebalances some alien space suits
2017-04-10 19:09:29 -05:00
Arokha Sieyes
cd2b42ceb0
Prevent ranged dogborg noms
...
Noooo thanks.
2017-04-10 19:36:42 -04:00
Arokha Sieyes
f451a7587f
Save weight when resleeving while here
2017-04-10 18:19:02 -04:00
