Commit Graph

2039 Commits

Author SHA1 Message Date
MisterLayne
dde6d7d00a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 9/26/2017_Synthetic_Syring_Fix 2017-09-26 17:30:30 -04:00
MisterLayne
99d68540bc Fixes Glitched Synthetic Syring 2017-09-26 17:12:47 -04:00
Anewbe
7c9813e24a Fixes a runtime 2017-09-25 23:42:25 -05: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
Cameron653
0f280a5233 75->100 2017-09-24 14:09:16 -04:00
Ketrai
e79f1f6534 fixes smol bug 2017-09-24 18:39:44 +02:00
Cameron653
36796260c4 Makes phoron half as strong as dex+ for vox.
Resolves #3808
2017-09-24 11:38:31 -04:00
Neerti
45ef87cb6b Merge pull request #3903 from Anewbe/cryotoxin_nerf
Cryotoxin should no longer be as fast or powerful
2017-09-23 13:00:02 -04:00
Anewbe
c80b535a29 Merge pull request #3902 from Neerti/9/19/2017_lost_drone
Adds the Lost Drone
2017-09-22 15:24:05 -05:00
Anewbe
40075a319a Merge pull request #3806 from ghost/woodbuck
Adds wooden buckets, craftable with botany.
2017-09-22 12:20:29 -05:00
Ketrai
5f42d335fc Nerfs shockchem.
Bumps down the potency of grub shockchems to accommodate the change made to the passive heals.
2017-09-22 13:18:55 +02:00
Anewbe
6d11df2754 Cryotoxin should no longer be as fast or powerful 2017-09-22 00:58:32 -05:00
Neerti
afd7b15442 Adds the Lost Drone 2017-09-22 01:17:53 -04:00
killer653
2755d3ddb1 HOTFIX 2017-09-21 20:26:48 -04:00
Spades
d2b8db26c1 Merge pull request #2148 from Cameron653/NUMBING_BITE_V2
Numbing bite v2
2017-09-21 19:47:17 -04:00
Anewbe
61936496b1 Merge pull request #3813 from Belsima/clickityclack
Adds a metric assload of sounds.
2017-09-20 22:20:17 -05:00
Anewbe
79581c5341 Merge pull request #3877 from Neerti/9/17/2017_trash_pile_port
Ports Trashpiles
2017-09-19 01:26:20 -05:00
Neerti
1c264176d9 Ports Trashpiles
Mostly ports Vore's Trashpile code, and made more generic, as I plan to use these for surface loot later.
Adds mold reagent to give a consequence to eating food you found in the garbage.
These aren't mapped in but I or someone else can do that later.
2017-09-18 06:34:10 -04:00
PrismaticGynoid
2a866c4924 Fixes for nettles (#3854)
* Fixes for nettles
Nettle plants can now spawn randomly from weeds - it was trying to spawn 'nettles', but the name of the plant is 'nettle', so it never spawned. Now it can.

You now hit people with food if you use it on harm intent. This is mostly so that you can use nettles as a weapon again, but hey, who wouldn't want to hit people over the head with a baguette.

Nettles and other stinging "fruits" can no longer be used to generate infinite chemicals by throwing them. Chemicals that the "fruits" inject are now properly removed when hitting a target.

* Fixes for nettles
Nettle plants can now spawn randomly from weeds - it was trying to spawn 'nettles', but the name of the plant is 'nettle', so it never spawned. Now it can.

You now hit people with food if you use it on harm intent. This is mostly so that you can use nettles as a weapon again, but hey, who wouldn't want to hit people over the head with a baguette.

Nettles and other stinging "fruits" can no longer be used to generate infinite chemicals by throwing them. Chemicals that the "fruits" inject are now properly removed when hitting a target.
2017-09-17 23:45:29 -05:00
Belsima
356d551ace Adds a pair of Skrellian drugs. (#3849)
* Adds a pair of Skrellian drugs.

* Fixes talum_quem damage.

* i copypastad wrong and now it wont compile

* Adds nicotine to cigarettes.

* Revert "Adds nicotine to cigarettes."

This reverts commit f7640f1142ff2f3c68caf90f6352a509915040c8.
2017-09-17 19:09:20 -05:00
Anewbe
9079d67e60 Merge pull request #3803 from chaoko99/FUCKINGSNOWFLAKES
Removes Chemspill volatile fuel. Makes N2O an oxidizer.
2017-09-17 19:07:01 -05:00
Anewbe
dcf31a959c Merge pull request #3848 from Belsima/scietist
Mild changes to alcohol strength + a spellcheck.
2017-09-17 10:39:09 -05:00
Belsima
a3bd21c387 Mild changes to alcohol strength + spellcheck. 2017-09-16 12:45:46 -04:00
killer653
bddfa16f82 Polaris sync 2017-09-15 21:17:34 -04:00
Mechoid
9373917b5c Makes Prometheans process various Toxins differently. Step One. (#3815)
* Makes Prometheans process various and base toxins differently.

* Tweak Slime jelly again
2017-09-15 17:00:48 -05:00
Cameron653
b44c380c13 Pens and needles. Ouch. 2017-09-14 18:13:35 -04:00
killer653
37dbb666ab Adds a slowdown.
Definitely noticable, not deliberating.
2017-09-14 15:57:32 -04:00
Cameron653
b0bbcf83c4 Merge branch 'master' into NUMBING_BITE_V2 2017-09-13 16:16:37 -04:00
killer653
5d3a64f74c Makes beakers require harm intent to splash/spill 2017-09-13 03:25:22 -04:00
killer653
2fa9a55360 Puts in a check so you don't drink & splash 2017-09-12 23:26:39 -04:00
killer653
577bc7f1d9 Allows dumping the contents out of bar glasses 2017-09-12 22:25:42 -04:00
Unknown
44b3905eca REmoves chemspill volatile fuel. Adds Oxidizing N2o 2017-09-12 09:41:08 -07:00
Ketrai
ab5aee8473 adds 2 more dishes 2017-09-11 19:18:09 +02:00
Cameron653
ce1a10eea1 Update Chemistry-Reagents-Medicine_vr.dm 2017-09-10 22:38:36 -04:00
Cameron653
92e5a19603 Update Chemistry-Reagents-Medicine_vr.dm 2017-09-10 22:37:54 -04:00
Cameron653
4befc0dede ))))))))))))))))))))))))))))))))))))))))))))))) 2017-09-10 22:13:34 -04:00
Cameron653
b0049c7f0c Adds OD effects 2017-09-10 22:07:29 -04:00
Anewbe
0f5f9b3bfc Merge pull request #3778 from ghost/crossaint
Adds croissants.
2017-09-10 20:54:13 -04:00
killer653
db3a941652 Adds numbing bite 2017-09-10 19:21:21 -04:00
Belsima
1fc7bc7674 Adds a metric assload of sounds. 2017-09-10 14:34:43 -04:00
Belsima
eb341aaa65 Adds wooden buckets, craftable with botany. 2017-09-09 17:16:34 -04:00
Ketrai
f02b45888b grubstuff 2017-09-09 22:19:21 +02:00
Ketrai
9104810b21 adds grubdrink etc 2017-09-09 22:16:59 +02:00
Ketrai
c32c88ba3e adds grubfoods 2017-09-09 22:13:46 +02:00
Ketrai
131975c281 adds grubchem 2017-09-09 22:12:31 +02:00
Spades
6eb472f31d Revert "Adds a new event - Solargrubs!" 2017-09-09 12:24:37 -04:00
Belsima
84d0fd2347 Missed an M. I thought it was Nutrient. 2017-09-08 15:47:12 -04:00
Belsima
92da4a84ee Adds crossaints. 2017-09-08 15:35:51 -04:00
Ketrai
19f05fc628 fixed a tiny indent error
wtf random tab
2017-09-05 16:19:56 +02:00
Ketrai
2d897fae13 adds grubmeat
MEAT
2017-09-05 16:11:41 +02:00