Commit Graph

14790 Commits

Author SHA1 Message Date
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
Neerti
2062083176 Merge pull request #2684 from Anewbe/varsity
Fixes the varsity jacket sprites
2016-10-26 23:17:30 -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
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
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
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
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
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
Anewbe
33b00b8762 Lowers the dislocate chance and damage from disarm intent hits 2016-10-16 21:47:42 -05: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
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
bea401be2d Fixes device cells 2016-10-16 13:42:16 -05:00
MagmaRam
c10b145782 Made bleeding from staunched wounds dynamic
yoshax did the thing etc
2016-10-13 22:36:00 -05:00
Anewbe
7a26fa94e3 Fixes the world >> "no sound" issue 2016-10-13 18:06:42 -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
MagmaRam
38a037edb3 Optimization tweak, credit to Yoshax 2016-10-12 15:59:18 -05:00
MagmaRam
bdf3dde514 Readd bleeding from open surgery stages. 2016-10-12 07:28:22 -05:00
MagmaRam
0fd5631c27 Bloodloss now depends on wound type and limb 2016-10-12 07:20:35 -05:00
MagmaRam
59d2608fbb Bruises now bleed at a much higher damage threshold. 2016-10-11 22:28:57 -05:00
Anewbe
5bfc0c851e Changes the way embedding works 2016-10-11 21:29:49 -05:00
Eearslya
66342af864 Fix solar assembly behavior while in inventory 2016-10-10 03:03:48 -07:00
redstryker
dbe19bdbd3 Emergency Medical Response Voidsuit 2016-10-09 14:55:53 -04: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
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