Atermonera
ac064b0717
Fixes #2643 , v2 ( #2693 )
...
* Fixes #2643 , unifies list syntax within /code/modules/clothing/suits/jobs.dm
* Capitalizes "Hush" in chaplain's hoodie examine text.
* Pulls Anewbe's Sec Gear Tweak changes, should resolve the conflicts.
* Ok, now I think I did it. Forgot to add cigarettes and lighters to the forensics jacket inventory.
* Forgot a comma, thanks Yosh
* Revert fix. I'm a donk
* Properly reverts fix for #2643
* Fixes #2643
* Unifies List syntax within /code/modules/clothing/suits/jobs.dm
* Config snuck into a commit
2016-10-28 22:29:18 -05:00
Anewbe
4130719b3b
Merge pull request #2683 from Yoshax/EfficientClosets
...
Adds subtype friendly method to populate crates.
2016-10-28 11:07:37 -05:00
Neerti
5f41b34082
Merge pull request #2686 from VOREStation/lube
...
Allow wet 'downgrades' on turfs
2016-10-26 23:17:47 -04:00
Neerti
2062083176
Merge pull request #2684 from Anewbe/varsity
...
Fixes the varsity jacket sprites
2016-10-26 23:17:30 -04:00
Arokha Sieyes
c7291c315f
Allow wet 'downgrades' on turfs
...
Such as allowing you to get water on a floor with spacelube to replace the lube with normal water which will eventually dry. Otherwise there is literally no way to clean up space lube. Which is a little ~~fun~~ crazy.
2016-10-26 22:21:48 -04:00
Anewbe
59d410348a
Fixes Aviators blocking flash incorrectly, adds in stylish aviators
2016-10-26 21:06:51 -05:00
Anewbe
b99ebf5dde
Fixes the varsity jacket sprites
2016-10-26 16:32:18 -05:00
PsiOmegaDelta
65b12a10f2
Adds subtype friendly method to populate crates.
2016-10-25 21:40:28 +01:00
Yoshax
11209a5b0e
Tweaks path from sechud/toggle to sechud/aviator
2016-10-25 20:40:26 +01:00
Yoshax
cf35da203b
Tweak the code, adds a couple of ❄️ to make it work
2016-10-25 19:18:01 +01:00
Yoshax
5a232b8837
Ports Baystation12/Baystation12#14433
2016-10-25 18:54:16 +01:00
Anewbe
b6e1b67246
Sec gear tweaks
2016-10-24 18:50:14 -05:00
Neerti
1e3a2791d6
Merge pull request #2655 from Anewbe/disarm_spam
...
Disarm spam is less effective
2016-10-24 19:34:07 -04:00
Neerti
7dadc5f6f9
Merge pull request #2658 from Anewbe/waistcoat
...
Waistcoats are accessories
2016-10-24 19:33:12 -04:00
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
Anewbe
b523406b27
Returns some functionality to the waistcoat, adds cham tie
2016-10-23 00:31:06 -05:00
Arokha Sieyes
bd3a749c13
Do NOT qdel() all client.screen objects
2016-10-22 22:12:54 -04:00
Anewbe
a1b1cf62c8
Disarm spam is less effective
2016-10-22 13:02:26 -05: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
Anewbe
510cf17723
Waistcoats are accessories
2016-10-19 22:29:22 -05: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
