Commit Graph

1566 Commits

Author SHA1 Message Date
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
Ketrai
08e98b9ba4 more grubtoxin stuff
Adds vermicetol, secret chem to treat burns really effectively
2017-09-05 16:01:36 +02:00
Ketrai
fb30c6f96b more grubtoxin stuff
burn baby burn
2017-09-05 16:00:11 +02:00
Ketrai
8673d5381a adds a chem for grubs
they use it to burn people
2017-09-05 15:58:27 +02:00
Ketrai
6dfbb1cda3 adds a chem for grubs
grubs use this chem to burn people
2017-09-05 15:57:11 +02:00
Neerti
8f00965cc2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 8/10/2017_make_xenobio_old_again
# Conflicts fixed:
#	code/modules/admin/topic.dm
#	code/modules/admin/verbs/debug.dm
#	code/modules/admin/view_variables/helpers.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/transform_procs.dm
#	maps/northern_star/polaris-1.dmm
#	polaris.dme
2017-09-05 00:58:27 -04:00
Neerti
4bfcec55f2 work 2017-09-04 21:52:47 -04:00
Mechoid
5d390ca67b Brings back the aliens as they were when removed, minus huggers (until we can get a suitable replacement), for admins to use. 2017-09-03 01:46:08 -07:00
killer653
cafac8efae Polaris Sync 2017-08-28 20:52:11 -04:00
Ketrai
15d978ba1c indentation is evil
Beware of copy-pasting code fuck
2017-08-28 22:39:32 +02:00
Ketrai
bcccf8e6f8 attempts fixing primal cubes again 2017-08-28 22:34:36 +02:00
Ketrai
f03b7a3e38 Fixes snack_vr dm for primal additions 2017-08-28 22:17:56 +02:00
Ketrai
8c0b06fc39 Adds the cubes themselves for the monkeys
as the titles says
2017-08-28 21:38:55 +02:00
Mechoid
0366320ae7 Gripper Fixes and Updates 2017-08-07 12:10:23 -07:00
killer653
468e73c7f3 Polaris sync 2017-08-06 19:07:17 -04:00
Neerti
99eb6f9404 Updates Tools
Adds toolspeed var, which is a multiplier on how 'fast' the tool works.  0.5 means it goes twice as fast.
Adds usesound var, which determines what sound is used when a tool is being used.
Changes a lot of code to use those two vars instead.
Adds 'ayyy' tools, which are ported from /tg/'s abductor gamemode.  They're currently admin only but I might make them obtainable by xenoarch later.
Adds powertools, also from /tg/.  CE starts with them in a new toolbelt that spawns in their locker, ported from (you guessed it) /tg/.
Changes welder sprites to look nicer, ported yet again from /tg/.  Modified the blue welder slightly so it can be the electric welder sprite.
Adds various sounds from /tg/, for tools and welders.
2017-08-03 04:49:23 -04:00
MagmaRam
2ca3c4f38c Merge pull request #3603 from Anewbe/drug_tweaks
Caps the negative effects of the high-end drugs
2017-07-28 15:23:59 -05:00
MagmaRam
f59cfae29a Merge pull request #3646 from Anewbe/hyperzine_tweaks
Hyperzine is no longer toxic
2017-07-28 15:18:03 -05:00
killer653
4fcbbe40f1 Size changes. 2017-07-28 06:43:44 -04:00
Anewbe
41e199cb92 The drink Balloon can now be made 2017-07-26 18:57:29 -05:00
Anewbe
5ae30058c0 Diona no longer gain nutrition from food 2017-07-26 17:48:33 -05:00
Anewbe
a2bea11d14 Hyperzine is no longer toxic 2017-07-26 13:45:13 -05:00
SilveryFerret
c8fc6f25e5 Oxyphoron change proposal (#3634)
* Changes oxyphoron to hydrophoron

* Stops hydrophoron magically producing oxygen

Instead, it creates a spark when it's tossed on the ground., and shoves
phoron into the air. Hooray!

* Change hydrophoron touch_turf proc at Anewbe's request

* Missed a /2
2017-07-25 16:44:30 -05:00
silveryferret
ad5cfd0087 Fixes Chemistry-Recipes.dm.
Not 100% sure how this happened, mergetool must've screwed up somehow.
2017-07-19 23:22:36 -04:00