Neerti
09030f8e8f
Merge pull request #2673 from Anewbe/cuff_port
...
Kills Telecuffs
2016-10-24 19:28:44 -04:00
Yoshax
8c68671b3b
Resolves an uplink issue
2016-10-24 23:11:55 +01:00
Anewbe
6d1d18a585
Kills telecuffs
2016-10-23 21:31:12 -05:00
Neerti
8bf97faaef
Another Big Technomancer PR
...
See PR for details.
2016-10-22 11:51:12 -04:00
Neerti
e5f23056be
Merge pull request #2654 from Anewbe/tape_fix_again
...
Should fix the tape thing.
2016-10-17 22:36:00 -04:00
Anewbe
fa53b659a4
Should fix the tape thing.
2016-10-17 16:52:20 -05:00
Cameron653
c535137bae
Fixes a problem with advanced_who
...
Advanced who was doing (Testname represents Ckey, StealthTest represents stealth Ckey)
"Testname" for admins when unstealthed, which was good, but it was doing
"TestnameStealthTest" when admins were stealthed.
This PR makes it start off as "Testname", then checks to see if they are stealthed. If so, it becomes "StealthTest," then adds in all the additional info (If they are observing, in lobby, or playing.)
2016-10-17 14:35:25 -04:00
Neerti
96767a6d05
Merge pull request #2647 from Anewbe/flashlight_device_cells
...
Flashlights use device cells
2016-10-16 17:34:54 -04:00
Neerti
b2e3f37213
Merge pull request #2620 from redstryker/ICEMTUC
...
Emergency Medical Response Voidsuit
2016-10-16 17:30:19 -04:00
Neerti
561e2709dd
Merge pull request #2622 from Anewbe/actual_embed_changes
...
Changes the way embedding works
2016-10-16 17:27:52 -04:00
Anewbe
44ac6b1b58
Tape rolls need to get a grip
2016-10-16 15:29:48 -05:00
Anewbe
bea401be2d
Fixes device cells
2016-10-16 13:42:16 -05:00
Anewbe
d76e4cd075
Flashlights use device cells
2016-10-16 13:30:38 -05:00
Anewbe
591d2719f3
Should fix penlights asking for cells
2016-10-14 21:29:03 -05:00
Anewbe
01b4c80ce4
Fixes Track spell
2016-10-13 18:27:28 -05:00
Anewbe
0def0f6789
Flashlight fixes
2016-10-12 23:20:19 -05:00
Neerti
955b5d1525
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/12/2016_overload_correction
2016-10-12 19:28:51 -04:00
Neerti
9404ad98fd
Overload Description Correction
...
Overload should correctly state how much damage it does, which is 0.3% of current charge, or 0.4% with the scepter of enhancement.
2016-10-12 19:26:39 -04:00
Anewbe
5bfc0c851e
Changes the way embedding works
2016-10-11 21:29:49 -05:00
Yoshax
b9e871bf5b
Quick flashlight fix
2016-10-10 02:27:58 +01:00
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
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
771d8b9e4b
Adds a smaller device cell for use in non-weapon devices
2016-10-08 15:34:18 -05: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
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
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
85e3f0e40e
Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into jukebox-v2
...
# Conflicts:
# polaris.dme
2016-10-06 23:54:45 -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
34da81b5e2
Fixes #2311
2016-10-07 04:07:59 +01:00
Yoshax
c4203600fc
Fixes #2354
2016-10-07 03:54:37 +01: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
Anewbe
7e79d9b5f8
Merge pull request #2596 from Neerti/10/5/2016_event_system
...
Cleans Up WIP Event System + New Grid Check For It
2016-10-06 20:45:55 -05:00
Neerti
337ef499a1
Cleans Up WIP Event System + New Grid Check For It
...
Separates the 'count and assess everything' stuff to it's own datum, called the metric datum, which I plan to add on to in the future to make counting and metrics easier.
Makes decision process a bit more weight-based, will probably continue tweaking later.
Makes the admin debug UI have links to change settings easily.
Adds replacement for grid check event, which works similar to the old one, but is now based on a physical machine in the game world, that Engineering can hack to make the event end faster, if so desired. Note that the machine is not mapped in, and won't be mapped in until the event system is ready for launch.
Adds grid_check variables to SMESes and APCs to make them stop doing work without draining the battery.
Grid checks in the new system are caused by a "power spike" which originates from the engine and will cause bad things, should no grid checker machine be connected to the power-net. These power spikes occur when the GM decides that a grid check is a good event to have.
The grid checker can be built and deconstructed using the standard machine construction methods.
2016-10-05 21:40:07 -04:00
Neerti
6203c1047f
Merge pull request #2582 from Anewbe/shotgun_boxes
...
Shotgun boxes now have 8 shells, uplink gives said boxes
2016-10-05 21:25:40 -04:00
Spades
dfe1f5d1b0
Wait, did I not add this? What the hell?
2016-10-05 20:26:47 -04:00
Neerti
c28e124bfc
Merge pull request #2592 from Anewbe/lattice_fix
...
Fixes lattice issue
2016-10-04 22:29:39 -04:00
