Neerti
5b4ab95bd5
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 3/14/2017_makeshift_armor
2017-04-14 03:54:23 -04:00
Neerti
e5fd28818d
Merge pull request #3299 from Anewbe/grabfix
...
Should fix throwing people.
2017-04-14 01:10:23 -04:00
Neerti
e4bd163331
Merge pull request #3265 from Anewbe/skrellian_voidsuit
...
Rebalances some alien space suits
2017-04-14 01:03:33 -04:00
Neerti
55fbf0b84b
Merge pull request #3288 from Anewbe/hard_hat
...
Hardhat tweaks
2017-04-14 01:02:40 -04:00
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
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
Anewbe
d1657e23c2
Ling and Technomancer now have ways to cure infections
2017-04-12 19:15:32 -05: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
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
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
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
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
SinTwo
afb6f1b572
Fixes : #3268
2017-04-10 23:32:38 -04:00
Anewbe
d9235883ff
Rebalances some alien space suits
2017-04-10 19:09:29 -05:00
Arokha Sieyes
a2ec0d43f1
Fix 'Spawn Character' DNA
...
Made spawned characters always use male sprites and not have accurate DNA. Also would runtime if you picked the option to not put a mind in, as it assumed there would be one.
2017-04-10 14:40:43 -04:00
Anewbe
6a99123f51
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into weapon_dulling
2017-04-10 11:26:09 -05:00
Anewbe
e373a0b353
Fixes the %ETA% thing on evac shuttles
2017-04-09 20:04:53 -05:00
Neerti
3828e7e3d9
Merge pull request #3253 from Anewbe/silent_knife
...
Drawing a knife from your boot no longer makes a loud noise.
2017-04-09 19:02:39 -04:00
Leshana
a23be7759b
Fix the runtime on server boot caused by uninitialized using_map
2017-04-09 16:12:47 -04:00
Neerti
2a8dc89f4e
Merge pull request #3242 from Anewbe/unathi_jerky
...
Adds in an Unathi-made jerky snack
2017-04-09 14:06:14 -04:00
Anewbe
f2cffa0a5d
Drawing a knife from your boot no longer makes a loud noise.
2017-04-09 12:44:25 -05:00
Neerti
e2e85e3702
Fixes Immortal (to melee) Borgs
2017-04-09 00:24:45 -04:00
Anewbe
8bc31fc027
Fixes the EMT labcoat sprite
2017-04-08 13:15:06 -05:00
Anewbe
4a33a8df82
Merge pull request #3216 from Neerti/3/22/2017_the_empress_protects
...
Implements the new Codex.
2017-04-08 13:02:43 -05:00
Neerti
a4a05ae4ec
Implements the new Codex.
2017-04-08 12:08:08 -04:00
Anewbe
6c169e7ad6
Adds in an Unathi-made jerky snack
2017-04-07 23:36:22 -05:00
Anewbe
e9c4b5a3eb
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things
...
# Conflicts:
# icons/mob/back.dmi
# icons/mob/items/lefthand.dmi
# icons/mob/items/righthand.dmi
2017-04-07 16:11:50 -05:00
SinTwo
828cffb25f
If observing before roundstart, you may respawn.
2017-04-07 12:52:22 -04:00
Neerti
3a0dadb1cb
Merge pull request #3229 from Anewbe/item_slowdown
...
Tweaks mob slowdown
2017-04-05 22:35:53 -04:00
Neerti
6a1451f5f0
Merge pull request #3230 from PolarisSS13/revert-3136-master
...
Revert "Updates drone respawn time."
2017-04-05 22:34:46 -04:00
Neerti
dbbd1f946e
Merge pull request #3231 from Anewbe/headbutt
...
Renames the proc for headbutting
2017-04-05 22:34:23 -04:00
Anewbe
ec7dbc1930
Renames the proc for headbutting
2017-04-05 15:55:35 -05:00
Anewbe
5dfc85e629
Merge pull request #3226 from Yoshax/lemat
...
Adds a LeMat Revolver
2017-04-05 13:32:16 -05:00
Anewbe
0184cea5f2
Revert "Updates drone respawn time."
2017-04-05 12:29:15 -05:00
Yoshax
530a2b5c60
Adds a LeMath Revolver
2017-04-05 14:29:24 +01:00
