Commit Graph

32322 Commits

Author SHA1 Message Date
redstryker
dbe19bdbd3 Emergency Medical Response Voidsuit 2016-10-09 14:55:53 -04:00
Neerti
32f87cac86 Merge pull request #2617 from Anewbe/cryo_batteries
Cryopods no longer eat the cells/ammo from weapons
2016-10-09 13:25:03 -04:00
Neerti
2e5c127ac8 Merge pull request #2616 from Anewbe/low_emp
Fixes low-yield EMP grenades
2016-10-09 13:24:56 -04:00
Neerti
46bade4426 Merge pull request #2615 from Anewbe/batteries_again
Batteries again
2016-10-09 13:24:51 -04:00
Neerti
cafe67aeff Merge pull request #2619 from Anewbe/colony_director_shit_again
Corrects some Station Administrator references in the map
2016-10-09 13:24:44 -04:00
Neerti
b28d483e01 Merge pull request #2618 from Anewbe/chain_lightning
Gives Chain Lightning an icon
2016-10-09 13:24:34 -04:00
Anewbe
810367f90e Corrects some Station Administrator references in the map 2016-10-08 22:48:15 -05:00
Anewbe
bfb6857a26 Gives Chain Lightning an icon 2016-10-08 20:28:41 -05:00
Anewbe
7cf2373da8 Cryopods no longer eat the cells/ammo from weapons 2016-10-08 19:51:39 -05:00
Anewbe
dacbca746c Fixes low-yield EMP grenades 2016-10-08 19:38:49 -05:00
Anewbe
fb4a84d869 Map change 2016-10-08 15:50:23 -05:00
Anewbe
860bff9816 Changelog 2016-10-08 15:50:08 -05:00
Anewbe
771d8b9e4b Adds a smaller device cell for use in non-weapon devices 2016-10-08 15:34:18 -05:00
Anewbe
426659c1d2 Merge pull request #2614 from redstryker/IDConsoleFix
Fixes ID Consoles
2016-10-08 11:58:03 -05:00
Anewbe
f47a7392e1 Merge pull request #2612 from Yoshax/changelog
Updates changelog
2016-10-08 11:57:52 -05:00
redstryker
192a5c8295 Fixes ID Consoles 2016-10-08 11:43:13 -04:00
Yoshax
e85f4a1c6e Updates changelog 2016-10-08 15:53:36 +01:00
Neerti
22aaf6553f Merge pull request #2611 from Anewbe/unload_fix
Weapon Cell Oversight fixes
2016-10-07 23:06:02 -04:00
Anewbe
9ff32b5914 Weapon Cell Oversight fixes 2016-10-07 21:48:21 -05:00
Anewbe
f4aeb10fdc Merge pull request #2606 from Yoshax/flashlights
Makes flashlights use cells
2016-10-07 21:26:13 -05:00
Yoshax
5fc4c4b889 Removes cell randomization and ensures slime flashlight things arent weird 2016-10-08 03:18:48 +01:00
Neerti
caa7d8a32f Merge pull request #2610 from PolarisSS13/revert-2555-revert-2530-revert-2450-revert-2446-revert-2375-revert-2361-hubbity
Revert "Revert "Revert "Revert "Revert "Revert "Adds hub passwordu""""""
2016-10-07 21:18:21 -04:00
Neerti
5a72ab5f48 Revert "Revert "Revert "Revert "Revert "Revert "Adds hub passwordu"""""" 2016-10-07 21:15:43 -04:00
Anewbe
5febffea2f Merge pull request #2590 from SpadesNeil/jukebox-v2
Jukebox Hacking. Again. Now with 100% less copyrights.
2016-10-07 17:18:24 -05:00
Anewbe
fc37a273b0 Merge pull request #2605 from redstryker/SpaceVault101Apparantly
Overseer Alt Title
2016-10-07 17:17:48 -05:00
Yoshax
24953efe7a Fixes some issues 2016-10-07 18:00:48 +01:00
Yoshax
087b9072e0 Adds changelog 2016-10-07 16:15:25 +01:00
Yoshax
a723eb3732 Makes flashlights use cells 2016-10-07 15:59:24 +01:00
redstryker
2331487ac0 Overseer Alt Title 2016-10-07 00:05:34 -04:00
Spades
961a9bfe6e Changelog 2016-10-06 23:58:36 -04:00
Spades
5c0dfce5cb NOW it's fixed! 2016-10-06 23:56:37 -04:00
Anewbe
6f9460194d Merge pull request #2604 from redstryker/IAmChangelogBitch
Changelog 10/6/2016 V2
2016-10-06 22:55:47 -05:00
Spades
85e3f0e40e Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into jukebox-v2
# Conflicts:
#	polaris.dme
2016-10-06 23:54:45 -04:00
redstryker
52ad7f144a Changelog 10/6/2016 V2 2016-10-06 23:48:47 -04:00
Anewbe
006197dbc6 Merge pull request #2603 from Yoshax/minorbugfixboogalo
Some bugfixes
2016-10-06 22:38:32 -05:00
Anewbe
673e75832a Merge pull request #2602 from SpadesNeil/death-to-the-administrator
Replaces Station Administrator with Colony Director, NASA Approved
2016-10-06 22:31:14 -05:00
Yoshax
760d5c3b54 Fixes #2258 2016-10-07 04:30:29 +01:00
Neerti
80faf02eee Merge pull request #2540 from Anewbe/device_cells
Energy weapons can be reloaded
2016-10-06 23:27:17 -04:00
Spades
f944692083 I demand credit! 2016-10-06 23:20:25 -04:00
Anewbe
8ce6926151 Map changes 2016-10-06 22:08:51 -05:00
Yoshax
34da81b5e2 Fixes #2311 2016-10-07 04:07:59 +01:00
Spades
707e4e560e Changelog! 2016-10-06 23:05:13 -04:00
Yoshax
8c02e93b03 Fixes #2587 2016-10-07 03:58:16 +01:00
Yoshax
5819397a0a Adds changelog 2016-10-07 03:58:05 +01:00
Yoshax
c4203600fc Fixes #2354 2016-10-07 03:54:37 +01:00
Anewbe
0bb855c266 Changelog 2016-10-06 21:50:58 -05:00
Yoshax
19e0342145 Resolves #2435 2016-10-07 03:43:28 +01:00
Spades
2330968176 Replaces Station Administrator 2016-10-06 22:38:02 -04:00
Anewbe
1a442aa7cc Merge things 2016-10-06 21:37:10 -05:00
Anewbe
0f51fda83a Energy weapons can be reloaded 2016-10-06 21:30:52 -05:00