Commit Graph

26102 Commits

Author SHA1 Message Date
Anewbe
215c080b1e Merge pull request #3438 from Neerti/5/9/2017_reopening_the_salt_mines
Adds Recently Cloned Modifier to Cloners
2017-09-26 19:09:12 -05:00
Anewbe
267f5299d9 Merge pull request #3932 from Cameron653/patch-4
Allows resting people to get off the ground w/ assistance.
2017-09-26 17:48:15 -05:00
Anewbe
c0205b1c78 Merge pull request #3953 from Woodratt/WR_09252017_SyndikatID
Syndicate ID changes
2017-09-26 16:03:16 -05:00
Anewbe
b6534b9008 Merge pull request #3949 from Atermonera/AI_langs
AI can speak station languages
2017-09-26 15:05:58 -05:00
Neerti
dcd2580dc2 Merge pull request #3918 from Anewbe/liver_alcohol
Adjusts liver damage from alcohol
2017-09-26 07:01:15 -04:00
Neerti
447ad5de70 Merge pull request #3927 from Anewbe/intercom
Adds more channels to intercom msg
2017-09-26 07:00:40 -04:00
Neerti
1076b264aa Merge pull request #3942 from Anewbe/promethean_core
Moves the Promethean core to the chest. They no longer need heads.
2017-09-26 03:46:30 -04:00
Neerti
1b22c7e152 Merge pull request #3941 from Anewbe/lung_pressure
Different species can now have different minimum levels of air
2017-09-26 03:44:49 -04:00
Anewbe
6d0e6c4b0f Merge pull request #3757 from SpadesNeil/Ace-infuriates-Anewbe-with-another-vintage-weapon
Adds M1 Garand
2017-09-26 01:09:46 -05:00
Neerti
6d821a9cfd Adds compromise. 2017-09-26 01:50:02 -04:00
Anewbe
7c9813e24a Fixes a runtime 2017-09-25 23:42:25 -05:00
Neerti
7c93f0089c Merge pull request #3944 from Anewbe/spiderbot_fix
Allows hatted slimes and spiderbots to ventcrawl properly.
2017-09-25 21:35:54 -04:00
Neerti
c262cd91c2 Merge pull request #3933 from Anewbe/batteries
Battery tweaks, self recharge fix
2017-09-25 21:32:41 -04:00
Neerti
13685ec747 Merge pull request #3926 from Anewbe/to_chat_watercloset
Adds a few instances of to_chat()
2017-09-25 21:32:13 -04:00
Neerti
147ef64555 Merge pull request #3925 from Anewbe/fire_stack_control
Adds adjust_fire_stack to a few places
2017-09-25 21:31:44 -04:00
Neerti
1f9cf5b8f4 Merge pull request #3923 from Anewbe/catwalks_and_railings
Improves catwalks and railings
2017-09-25 21:31:28 -04:00
Neerti
6024698679 Merge pull request #3922 from Anewbe/organ_printer_fixes
Printed limbs now have species and skin color
2017-09-25 21:30:56 -04:00
Woodratt
9f806e2f67 Syndicate ID changes
- Added a Syndicate ID with all access (admin spawn only).
- Port of 'Syndicate id cards now listen for owner destruction' from Bay. Link https://github.com/Baystation12/Baystation12/pull/11563
2017-09-25 17:01:55 -07:00
Anewbe
f1c0b32688 Merge pull request #3946 from Neerti/9/25/2017_shields_and_spiders
More Simple Animal Tweaks
2017-09-25 18:12:10 -05:00
Anewbe
676f71994f Merge pull request #3943 from Neerti/9/24/2017_simple_mob_tweaks
Simple Animal Tweaks
2017-09-25 18:11:59 -05:00
Anewbe
d032051568 Merge pull request #3945 from Cyantime/pipexamine
Corrects pipe examine info.
2017-09-25 17:45:21 -05:00
Atermonera
650d2a7321 indents 2017-09-25 13:49:10 -07:00
Atermonera
a4fd97ca14 Rootlocal and -global can also be used by AI 2017-09-25 13:48:34 -07:00
Anewbe
6067afe64c Merge pull request #3824 from Cameron653/DRINK_SPILLING
Allows the dumping of drinks & beaker spill tweak
2017-09-25 14:51:52 -05:00
Anewbe
c822b7b63c Merge pull request #3931 from Cameron653/patch-2
Makes phoron heal more oxyloss for vox.
2017-09-25 14:50:45 -05:00
Anewbe
4e074247cb Merge pull request #3937 from Neerti/9/24/2017_SM_tweaks
Minor SM Tweaks
2017-09-25 14:27:29 -05:00
Atermonera
e00a6b29bc Merge branch 'master' into AI_langs 2017-09-25 11:40:40 -07:00
Atermonera
aeab6e362d AI can speak station languages, excluding rootspeak 2017-09-25 11:38:34 -07:00
Neerti
0fc4b4587d Merge pull request #3938 from Anewbe/spawn_points
Fixes the issue with spawn points
2017-09-25 02:06:22 -04:00
Neerti
7af5ad0c40 More Simple Animal Tweaks
Simple Animals can now be blocked with shields.
Spider injections can be blocked with THICKMATERIAL armor.
Egg injections have bigger text.
2017-09-25 01:41:52 -04:00
Cyantime
778f10b4ea Corrects pipe examine info. 2017-09-25 00:57:16 -04:00
Anewbe
59465ddc2d Allows slimes and spiderbots to ventcrawl properly. 2017-09-24 22:44:27 -05:00
Neerti
64f02f70b2 Simple Animal Tweaks
Makes hivebots a bit smarter, shifts stats around, adds a few new sprites thanks to Mechoid, and adds a few new types.
Adds verbs that can be used as a player hivebot, to get them to follow you.
Spider eyes can now be seen clearly in the darkness, which looks spooky.
2017-09-24 23:43:14 -04:00
Anewbe
ee50dc7b01 Moves the Promethean core to the chest. They no longer need heads. 2017-09-24 21:38:30 -05:00
Anewbe
5df7fce5b0 Different species can now have different minimum levels of air 2017-09-24 20:21:00 -05:00
Anewbe
860b47d3dc Fixes the issue with spawn points 2017-09-24 16:40:10 -05:00
Neerti
02a9e64656 Minor SM Tweaks
Moves the SM files into the power folder.
Makes the SM have a radiation floor of 50, instead of being completely inert when uncharged.
2017-09-24 17:23:01 -04:00
Anewbe
1a9458fe13 Fixes the Gravity Failure Event 2017-09-24 14:03:43 -05:00
Cameron653
0f280a5233 75->100 2017-09-24 14:09:16 -04:00
Cameron653
b41c2fec9a One final fix 2017-09-24 13:26:38 -04:00
killer653
67d3d1b890 Whoops 2017-09-24 13:13:42 -04:00
Cameron653
3113e37afa Update carbon.dm 2017-09-24 12:55:59 -04:00
Anewbe
213bd431f3 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into batteries 2017-09-24 11:27:34 -05:00
Cameron653
a71b7c599b Update carbon.dm 2017-09-24 12:27:25 -04:00
Anewbe
8a07728302 Battery tweaks, self recharge fix 2017-09-24 11:26:49 -05:00
Cameron653
a752b2ac39 Adds delay, fixes gender check. 2017-09-24 12:24:27 -04:00
Cameron653
05a4b1a31f Update carbon.dm 2017-09-24 12:10:53 -04:00
Cameron653
1b8cbd3b78 Update carbon.dm 2017-09-24 12:10:17 -04:00
Cameron653
20352ddf0c Allows resting people to get off the ground w/ assistance. 2017-09-24 11:57:07 -04:00
Cameron653
36796260c4 Makes phoron half as strong as dex+ for vox.
Resolves #3808
2017-09-24 11:38:31 -04:00