Commit Graph

26773 Commits

Author SHA1 Message Date
Neerti
9bb5db3755 Merge pull request #4187 from Anewbe/electrocute_act
Improves electrocute_act, adds ELECTROCUTE damage type
2017-11-01 23:11:07 -04:00
Anewbe
67792ad5b5 Adds a necessary rand 2017-11-01 21:59:43 -05:00
Anewbe
6611cb271b Merge pull request #4190 from mistyLuminescence/plushierework2561
Plushie tweaks!
2017-11-01 21:57:56 -05:00
Anewbe
35ef57705a Merge pull request #4197 from Atermonera/ATC_stat
ATC ships won't go to the current station
2017-11-01 21:47:54 -05:00
Anewbe
1d19fbe59c Ling stings can't affect synthetics now 2017-11-01 20:51:56 -05:00
Verkister
d36753c2fd almost forgot tesh had no separate deform sheet to convert 2017-11-01 09:45:27 +02:00
Atermonera
61a9c434f1 ATC ships won't go to the current station 2017-10-31 22:59:34 -07:00
Anewbe
08bcfded73 Changes how organ infections work 2017-11-01 00:41:59 -05:00
Mechoid
794bd0ab6f Adds a mounted welder to the welderpacks in engineering. 2017-10-31 20:07:14 -07:00
Wickedtemp
a3ba6ff5d9 Update hypospray.dm 2017-10-31 20:52:02 -05:00
Anewbe
73ad06c706 Botanist ID now has the proper default job/title 2017-10-31 20:41:15 -05:00
mistyLuminescence
eef59a1bbc tweaks v2 2017-10-31 20:49:17 +00:00
Atermonera
4e191a2bd7 improper sleeper 2017-10-31 09:41:05 -07:00
mistyLuminescence
f67a3858cd Plushie tweaks! 2017-10-31 15:47:00 +00:00
Anewbe
396fea0365 Merge pull request #4186 from Woodratt/10302017_ArlShtlefix
SC Arrivals Shuttle fix
2017-10-31 10:28:05 -05:00
Verkister
45f53405fe Converts colorable species into the combo blend mode.
-Unathi, Tajaran, Skrell, and Teshari now use mult+add combo blending.
-As do their tails, tail anims, and extra tesh feathers.
-No issues detected on latest test runs.
2017-10-31 12:50:15 +02:00
Atermonera
64942bd04c VR Core 2017-10-30 22:32:36 -07:00
Anewbe
cc7ba41c34 Improves electrocute_act, adds ELECTROCUTE damage type 2017-10-30 22:00:25 -05:00
Anewbe
8d8052f486 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into rerobust_simple_mobs
# Conflicts:
#	code/modules/mob/living/simple_animal/simple_animal.dm
2017-10-30 21:32:14 -05:00
Anewbe
ff4be8c2e2 Jumper cables now clear FBP toxloss 2017-10-30 21:28:43 -05:00
Neerti
93caf0dafe Merge pull request #4178 from Anewbe/recursive_claw_buff
Recursive Claw now has pry
2017-10-30 21:12:05 -04:00
Neerti
318ccff1c9 Merge pull request #4177 from Anewbe/background
Ports the background icons for char setup
2017-10-30 20:35:55 -04:00
Neerti
156423f0a2 Merge pull request #4174 from Anewbe/simple_animal_attacks
Buffs simple mob hit chance
2017-10-30 20:35:21 -04:00
Neerti
1b96f11c27 Merge pull request #4159 from Anewbe/emp_rune
EMP rune radius increase
2017-10-30 20:34:56 -04:00
Neerti
a981f9388f Merge pull request #4183 from Dunkhan/master
Added a set of atmospheric analysis sensors...
2017-10-30 20:33:07 -04:00
Woodratt
e639887584 SC Arrivals Shuttle fix
- Fixes issues with the SC arrivals shuttles in regards to airlocks
- New Shuttle seats, ported from Vorestation
2017-10-30 15:56:44 -07:00
Verkister
1ba7a08339 Fixes borgs being unable to push past humans.
-Swap flags (for bumping in help intent) did not include humans for no given reason while still allowing other mobs and other way around interaction.
2017-10-30 21:17:59 +02:00
Anewbe
ad8a7f4ff0 Merge pull request #4172 from Belsima/rng
Emag RNG removed from APCs.
2017-10-29 14:27:32 -05:00
Dunkhan
c6c015ebbb Added full stops to description text 2017-10-29 20:08:44 +01:00
Dunkhan
ef40c806be Removed trailing list commas 2017-10-29 17:34:21 +01:00
Anewbe
2ee7769305 Merge pull request #4179 from Verkister/hairrevolution
It's time for hair color revolution here too!
2017-10-29 10:25:26 -05:00
Dunkhan
151e2b8d02 Fixed spelling and capitalisation errors 2017-10-29 15:07:18 +01:00
Dunkhan
2dbbd59888 Added a set of atmospheric analysis sensors to the integrated electronics module 2017-10-29 14:46:14 +01:00
Anewbe
93464d16db Adjusts simple mobs 2017-10-28 15:44:39 -05:00
Anewbe
61c122aea0 Tox damage shows up on Self-Diagnosis 2017-10-28 14:58:19 -05:00
Mechoid
91298b1106 Merge pull request #4167 from Anewbe/soak_fix
Armor soak should actually work for humans now
2017-10-28 12:27:04 -07:00
Anewbe
0c4e88ec32 Adjusts how radiation works, especially for FBPs 2017-10-28 14:08:48 -05:00
Anewbe
ff3420a5df Merge pull request #4180 from Belsima/ruleb
WITH exceptions!
2017-10-28 10:37:52 -05:00
Belsima
e156bb4d1e WITH exceptions! 2017-10-28 10:15:38 -04:00
Verkister
404ac0f42c It's time for hair color revolution here too!
-Aye greetings from downstream hell where I managed to solve the locally intense ADD vs MULTIPLY blend mode discource once and for all with a fresh as hell new option that combines the best of both worlds without the downsides.
-You can now have hairstyles that retain both, shading and highlights in every color how cool is that?
-Got told to port this stuff up here too so you're welcome. Spread the word if ya want. Planning to hit up the other blend stuffs as well some time, but here's a little something for now.
2017-10-28 17:00:21 +03:00
Anewbe
6e1ab3235c Recursive Claw now has pry 2017-10-28 02:40:43 -05:00
Anewbe
966749b5f4 Merge pull request #4168 from Neerti/10/27/2017_lag_fix
Proto/Autolathe lag fix
2017-10-28 02:13:12 -05:00
Anewbe
c68fb0861f Ports the background icons for char setup 2017-10-27 23:00:34 -05:00
Anewbe
c9cbbd3a9b Swaps non-mounted recharging guns to batteries 2017-10-27 20:43:31 -05:00
Anewbe
eb4a6744f8 Merge pull request #4163 from Anasari/PaperPlane
Port paper plane from /tg/
2017-10-27 20:38:48 -05:00
Anewbe
6dfea97220 Merge pull request #4166 from Neerti/10/26/2017_shields
Adds New Advanced Shields, Tweaks
2017-10-27 20:38:27 -05:00
Anewbe
15e2fd15eb Buffs simple mob hit chance 2017-10-27 16:08:29 -05:00
Belsima
aac82665b8 Emag RNG removed. 2017-10-27 13:58:35 -04:00
Belsima
8542fcde97 Success! 2017-10-27 13:43:05 -04:00
Mechoid
ec9dded0cc Merge pull request #4151 from MisterLayne/LanguageModule
Cyborg Language Module
2017-10-27 10:24:07 -07:00