Neerti
0bc0136f40
Merge pull request #2661 from Anewbe/shaved
...
Adds shaved short hair and five o'clock shadow beard
2016-10-24 19:30:58 -04:00
Neerti
6603e4c204
Merge pull request #2670 from Anewbe/spidertest
...
Slightly reworks the way spiders inject poison
2016-10-24 19:30:08 -04:00
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
Anewbe
e13b2c513f
Merge pull request #2669 from SpadesNeil/centcom-not-centcomm
...
Fixes Sol Gov and CentCom stamp names
2016-10-23 15:51:40 -05:00
Anewbe
c3c01e655d
Slightly reworks the way spiders inject poison
2016-10-23 14:43:35 -05:00
Spades
d16ed00228
Fixes Sol Gov and CentCom stamp names
...
This was irritating me.
- "solgov stamp" is now "Sol Government rubber stamp"
- "centcomm rubber stamp" is now "CentCom rubber stamp"
2016-10-23 15:39:42 -04:00
Anewbe
5f466c8802
Merge pull request #2659 from Neerti/10/21/2016_new_gridcheck
...
Adds the new Grid Check event to rotation.
2016-10-23 13:35:36 -05:00
Anewbe
576f1766ec
Merge pull request #2663 from Neerti/10/22/2016_technomancer_patch_everything_gets_nerfed
...
Another Big Technomancer PR
2016-10-23 13:35:10 -05:00
Anewbe
8c509f5843
Merge pull request #2656 from ParadoxSpace/spidervenom
...
Nurse Spider Fixes
2016-10-23 13:05:29 -05:00
Neerti
d3a7352371
Merge pull request #2667 from VOREStation/globalhudfix
...
Do NOT qdel() all client.screen objects
2016-10-23 05:48:39 -04:00
Arokha Sieyes
bd3a749c13
Do NOT qdel() all client.screen objects
2016-10-22 22:12:54 -04:00
Neerti
8bf97faaef
Another Big Technomancer PR
...
See PR for details.
2016-10-22 11:51:12 -04:00
Anewbe
6f53a3b3bf
Merge pull request #2657 from PapaDrow/18.08.16_adds_striped_underwear
...
Adds striped undergarments
2016-10-21 22:31:10 -05:00
Anewbe
5e730703b5
Adds shaved short hair and five o'clock shadow beard
2016-10-21 18:41:39 -05:00
Arokha Sieyes
3309448684
Remove 'extra' helmet from RD rig
2016-10-21 18:53:38 -04:00
Neerti
bb489cb09f
Adds the new Grid Check event to rotation.
...
Maps in a new Grid Checker machine, located in an expanded substation room in Engineering. When a grid check happens, Engineering can hack that machine to restore power sooner. Wearing insulated gloves is highly recommended.
2016-10-21 12:47:57 -04:00
PapaDrow
560edb9687
Adds striped underoos in the same pattern as the striped socks, as it says on the tin. Should support recolouring.
2016-10-19 18:36:56 -04:00
ParadoxSpace
5dfca8979e
Update giant_spider.dm
2016-10-18 14:49:51 -06:00
ParadoxSpace
6a9c448887
Update giant_spider.dm
2016-10-18 13:47:14 -06:00
ParadoxSpace
45611d9e63
Update giant_spider.dm
2016-10-18 11:08:30 -06:00
Neerti
67330d1df6
Merge pull request #2652 from Anewbe/dislocate_numbers
...
Lowers the dislocate chance and damage from disarm intent hits
2016-10-17 22:36:08 -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
Anewbe
33b00b8762
Lowers the dislocate chance and damage from disarm intent hits
2016-10-16 21:47:42 -05: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
Neerti
b0ebe0e4eb
Merge pull request #2648 from Anewbe/tape_roll
...
One requires a grip to use tape rolls on people
2016-10-16 17:26:53 -04:00
Neerti
78a1e1cf48
Merge pull request #2631 from MagmaRam/bloodloss
...
Bloodloss balancing
2016-10-16 17:26:41 -04:00
MagmaRam
e066506ccb
Blunt weapons can no longer cause cuts.
...
This is a necessary change for the intended effect of this bloodloss
system.
2016-10-16 15:53:04 -05:00
MagmaRam
289d32c23a
Used the wrong defines for the organ tags, whoops.
2016-10-16 15:52:17 -05:00
Anewbe
44ac6b1b58
Tape rolls need to get a grip
2016-10-16 15:29:48 -05:00
Neerti
f7706373b2
Merge pull request #2646 from Anewbe/device_cell_fixes
...
Fixes device cells
2016-10-16 14:51:36 -04: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
ced74308e9
Fixes some Cargo crate issues
2016-10-16 13:21:05 -05:00
Anewbe
591d2719f3
Should fix penlights asking for cells
2016-10-14 21:29:03 -05:00
MagmaRam
c10b145782
Made bleeding from staunched wounds dynamic
...
yoshax did the thing etc
2016-10-13 22:36:00 -05:00
Neerti
72715b40d8
Merge pull request #2638 from Anewbe/track_spell
...
Fixes the bug where the Track spell doesn't go away when dropped
2016-10-13 22:29:27 -04:00
Anewbe
01b4c80ce4
Fixes Track spell
2016-10-13 18:27:28 -05:00
Anewbe
7a26fa94e3
Fixes the world >> "no sound" issue
2016-10-13 18:06:42 -05:00
Anewbe
0def0f6789
Flashlight fixes
2016-10-12 23:20:19 -05:00
MagmaRam
b141a993de
More tweaks that Yoshax should get credit for
2016-10-12 22:02:56 -05:00
MagmaRam
45d1dcc966
Merge branch 'bloodloss' of https://github.com/MagmaRam/polaris
2016-10-12 22:00:33 -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
MagmaRam
38a037edb3
Optimization tweak, credit to Yoshax
2016-10-12 15:59:18 -05:00
