Commit Graph

12186 Commits

Author SHA1 Message Date
Neerti
3df4160714 Merge pull request #2383 from SpadesNeil/doors
Fixes external airlocks
2016-08-29 23:48:48 -04:00
Anewbe
98dfec3bc8 Elevator-MMI fix 2016-08-29 22:06:55 -05:00
Spades
0b6285b153 Fixes external airlocks 2016-08-29 20:02:03 -04:00
Yoshax
6ae1ab1a8f Merge pull request #2374 from Neerti/8/28/2016_turret_fix
Turret Fix
2016-08-29 03:29:59 +01:00
Neerti
b365e16c88 Turret Fix
Turrets can now deploy properly and not be stuck in a state of deploying forever if a target is in range.
2016-08-28 22:21:48 -04:00
Anewbe
9ccf1a32ba Merge pull request #2371 from Neerti/8/28/2016_prying_blastdoor_fix
Fixes runtime that occured if someone touched a blast door with an empty hand.
2016-08-28 21:06:34 -05:00
Neerti
29ada680d5 Fixes runtime that occured if someone touched a blast door with an empty hand. 2016-08-28 21:41:58 -04:00
Neerti
e34afed3fa Fixes cryopods of all types not setting occupant correctly. 2016-08-28 21:15:02 -04:00
redstryker
ac81a5003c Examine Cigarette Lore 2016-08-28 16:04:07 -04:00
Yoshax
f7c459d796 Merge pull request #2357 from SinTwo/framecleanup2
Frame Cleanup + Machinery Code Cleanup
2016-08-28 18:31:16 +01:00
Anewbe
5346384548 Merge pull request #2307 from redstryker/Alt_titles
Adds Multiple Alternative Titles
2016-08-27 22:22:13 -05:00
SinTwo
71b5914ce3 alt title 2016-08-27 14:26:03 -04:00
SinTwo
a2a2f58e93 Fixes #2352 2016-08-27 13:44:32 -04:00
Neerti
e455583a49 Merge pull request #2350 from Anewbe/cappy_closet
Tweaks the contents of the captain's closet
2016-08-24 23:27:37 -04:00
SinTwo
fa92cdeeda Merge branch 'master' of https://github.com/PolarisSS13/Polaris into framecleanup2 2016-08-23 18:33:51 -04:00
Anewbe
54f8725c83 Smokables now give an approximation of how much longer they'll burn once lit 2016-08-23 00:08:18 -05:00
Anewbe
4aaa45736d Tweaks the contents of the captain's closet 2016-08-21 21:22:09 -05:00
Neerti
1a8eafc1ae Merge pull request #2299 from Yoshax/captain
Captain job title changes
2016-08-21 18:51:51 -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
redstryker
9f4c93140f Removed Brig Officer 2016-08-18 18:55:18 -04:00
redstryker
120ff7b647 Removed Life Support Technician 2016-08-18 18:54:50 -04:00
redstryker
d4614e2ec3 Changed Requisitions Officer to Supply Chief and Removed Courier 2016-08-18 18:54:17 -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
Neerti
9177ab31cc Merge pull request #2327 from SinTwo/bugfixbugaloo
Fixes
2016-08-15 18:19:05 -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 6bb5409349, reversing
changes made to f6a83d5ee0.
2016-08-15 12:58:00 -04: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
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
cba8cdcde8 Fixes #2036 2016-08-15 10:38:32 -04:00
SinTwo
8a5e045921 Fixes #2302 2016-08-15 10:33:53 -04:00
redstryker
3296c20c7d Changed Supply Officer to Requisitions Officer 2016-08-15 09:58:41 -04: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
Yoshax
cfaada473b Fixes change appearance not working for other species 2016-08-14 16:10:07 +01:00
Anewbe
0cb1f8c27a Cleans up the code to match recent Tajaran rewrite 2016-08-13 23:07:00 -05:00
SinTwo
045c393683 Revert "Revert "Frame Cleanup""
This reverts commit 82722ba42f.
2016-08-13 19:55:57 -04:00
Yoshax
b2ba310df0 Fixes dirt 2016-08-13 15:30:20 +01:00
redstryker
e41d2f8e31 Removed Computer Scientist 2016-08-12 22:28:05 -04:00