SinTwo
fa92cdeeda
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into framecleanup2
2016-08-23 18:33:51 -04:00
Neerti
1a8eafc1ae
Merge pull request #2299 from Yoshax/captain
...
Captain job title changes
2016-08-21 18:51:51 -04:00
Neerti
7872f7e2ad
Merge pull request #2347 from Anewbe/fire2
...
Tweaks the lowest level of heat damage to be less insane
2016-08-20 20:26:26 -04:00
Neerti
515ba0677a
Maybe Perhaps Last Major Technomancer PR
...
Adds ability to sort the spells section of the catalog into categories. The categories available are 'All', 'Offensive', 'Defensive', 'Utility', and 'Support'.
Removes preset section on catalog as it was unused.
Projectile spells now have a sound when fired.
Haste lasts five seconds instead of three.
Repel Missiles lasts for five minutes instead of two.
All healing spells work five times as fast, healing in five seconds instead of twenty five seconds. The amount of instability and healing done has been multiplied to remain consistent.
Passwall can now be used on more than just walls, if there's something dense on the same tile.
Force Missile is now 25% cheaper to cast, and has a cooldown of .5 seconds instead of one second, and does 5 more damage.
Beam's damage is increased by 10, and energy cost decreased by 25%.
Lightning's warm-up time is now one second instead of two.
Overload now costs 10% of total energy instead of 15%, and damage scaled with 4% of their current energy reserves, and 5% with the Scepter, instead of 3%/4%. Additionally, instability per shot is lowered to 12 from 15.
Track now costs 25 points instead of 30 in the catalog, because roundness.
Fire Aura should look more impressive without a Scepter.
Fixes bug where shooting Lightning made you motionless for twenty seconds.
2016-08-19 19:21:55 -04:00
Anewbe
e8f70528a7
Corrects damage amount for heat_damage_level_1
2016-08-19 17:08:11 -05:00
Anewbe
27aa20957f
Tweaks the lowest level of heat damage to be less insane
2016-08-18 22:31:25 -05:00
Neerti
71dc1413c4
Merge pull request #2335 from Yoshax/lungfix
...
Actually fixes lung rupturing and does so with less runtimes
2016-08-16 15:06:15 -04:00
Neerti
4d674a1594
Merge pull request #2322 from Hubblenaut/penlight
...
CMO and Doctors spawn with Health Analyzer
2016-08-16 15:00:05 -04:00
Yoshax
c160b88f57
Merge pull request #2332 from Cameron653/master
...
Makes pierce damage heal correctly when bandaged
2016-08-16 19:15:01 +01:00
Yoshax
dd0bea114a
Actually fixes lung rupturing and does so with less runtimes
2016-08-16 17:55:08 +01:00
Yoshax
8e2edd03f7
Fixes lung rupturing
...
Adds changelog
Shamelessly steals HarpyEagle's code
2016-08-16 16:43:58 +01:00
GinjaNinja32
a76c0cf75a
Add inactivity time to player panel
2016-08-16 16:34:33 +01:00
Cameron653
995ae56dfe
Makes pierce damage correctly heal when bandaged
2016-08-15 20:39:55 -04:00
Neerti
9177ab31cc
Merge pull request #2327 from SinTwo/bugfixbugaloo
...
Fixes
2016-08-15 18:19:05 -04:00
Neerti
a800fa33d5
Merge pull request #2329 from Yoshax/englishlist
...
Rewrite english_list to be a little nicer on lists of objects, and also faster
2016-08-15 18:18:48 -04:00
Neerti
3e1a186569
Merge pull request #2328 from Yoshax/hardsuitexamine
...
Lists installed hardsuit modules when examining
2016-08-15 18:18:16 -04:00
Neerti
988094d838
Merge pull request #2323 from Yoshax/IDears
...
Actually allows IDs to be put ~~in~~ on your ears
2016-08-15 18:05:59 -04:00
SinTwo
eabefc538a
Revert "Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade"
...
This reverts commit 6bb5409349f6a83d5ee0
2016-08-15 12:58:00 -04:00
Yoshax
e395e7374d
replace pointless english_list call with jointext
2016-08-15 17:33:36 +01:00
GinjaNinja32
12bc3aa0ff
Rewrite english_list to be a little nicer on lists of objects, and also faster
2016-08-15 17:31:10 +01:00
SinTwo
6bb5409349
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade
...
Conflicts:
code/modules/admin/holder2.dm
2016-08-15 12:26:53 -04:00
Kasuobes
6c6ff63747
Squished list of isntalled modules if any
...
It looks prettier! :D Also won't spam the chat log as much if someone has a dozen modules installed.
2016-08-15 17:25:19 +01:00
Kasuobes
557728baa9
Lists installed hardsuit modules when examining
...
Similar to how examining mechs will list all the installed equipment, RIGs will now list all installed modules if the panel is open, while the RIG is being held or worn.
2016-08-15 17:25:11 +01:00
SinTwo
fcea10c106
Fixes #2092
2016-08-15 11:33:41 -04:00
SinTwo
265eaba34f
Fixes #2122
2016-08-15 11:25:00 -04:00
SinTwo
0b96487e0d
Fixes #2012
2016-08-15 10:46:26 -04:00
SinTwo
ae0fbd52c2
Fixes #1620
2016-08-15 10:45:13 -04:00
SinTwo
cba8cdcde8
Fixes #2036
2016-08-15 10:38:32 -04:00
SinTwo
8a5e045921
Fixes #2302
2016-08-15 10:33:53 -04:00
EmperorJon
f6a83d5ee0
Merge pull request #2326 from Hubblenaut/bottle
...
Bottles will now sell for their set prices.
2016-08-15 14:46:26 +01:00
Hubblenaut
10391e5f3b
Bottles will now sell for their set prices.
2016-08-15 15:32:28 +02:00
Yoshax
d206f0d80d
Actually allows IDs to be put ~~in~~ on your ears
2016-08-15 13:58:42 +01:00
Hubblenaut
c625562256
CMO and Doctors spawn with Health Analyzer (instead of penlight)
2016-08-15 14:55:08 +02:00
Yoshax
c26f9ed68b
Fixes everyone and their dad having QM access
2016-08-15 13:45:36 +01:00
EmperorJon
f6a7d068d5
Merge pull request #2314 from Anewbe/taj_cleanup
...
Taj cleanup
2016-08-15 11:32:05 +01:00
EmperorJon
2810683110
Merge pull request #2319 from ColaFiend/master
...
Minor text fixes.
2016-08-15 10:04:08 +01:00
ColaFiend
50a93f98b1
Update floor.dm
2016-08-15 09:52:38 +01:00
EmperorJon
4a11ea2283
Merge pull request #2308 from Hubblenaut/master
...
Adds a verb for toggling specific pieces of underwear
2016-08-15 09:50:26 +01:00
Brightdawn~
b5eec907c0
Minor text fixes.
...
Changes description of rainbow shoes.
Adds description for:
Potted Plant
Plating
2016-08-15 06:31:42 +01:00
SinTwo
9e4d4752ac
cleanup
2016-08-14 20:46:04 -04:00
Neerti
32fcb9f6ee
Merge pull request #2317 from Anewbe/access_tweaks
...
Removes Chaplain morgue access
2016-08-14 14:24:48 -04:00
Anewbe
0b9a0691d3
Removes Chaplain morgue access
2016-08-14 12:13:20 -05:00
Yoshax
02c11fe87f
Updates the valid species list to have all species
2016-08-14 17:24:58 +01:00
Yoshax
5426efcb39
Fixes valid_species having datums
2016-08-14 17:14:26 +01:00
PsiOmegaDelta
de6d2a4a31
Fixes check_rights runtiming for non-holders.
...
Fixes all kinds of errors.
2016-08-14 16:10:39 +01:00
Yoshax
cfaada473b
Fixes change appearance not working for other species
2016-08-14 16:10:07 +01:00
Anewbe
aa81925b71
Adds Changelog
2016-08-13 23:18:51 -05:00
Anewbe
0cb1f8c27a
Cleans up the code to match recent Tajaran rewrite
2016-08-13 23:07:00 -05:00
Neerti
4e37d71657
Merge pull request #2291 from Kelenius/botAccess
...
Roboticists now can access bots.
2016-08-13 20:24:35 -04:00
Anewbe
3870349d35
Merge pull request #2309 from Yoshax/paperwork
...
Refactor of admin fax handling
2016-08-13 19:22:47 -05:00
