Commit Graph

1420 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
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
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
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 f7640f1142.
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
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
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
Anewbe
0f5f9b3bfc Merge pull request #3778 from ghost/crossaint
Adds croissants.
2017-09-10 20:54:13 -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
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
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
Mechoid
0366320ae7 Gripper Fixes and Updates 2017-08-07 12:10:23 -07: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
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
silveryferret
3d3ff303c7 Adds missed Oxyphoron reaction, moves Deuterium/fifty into obj/fiftyspawner/deuterium 2017-07-19 23:14:15 -04:00
silveryferret
7567726c07 Ports R-UST from Baystation12 + small admin debug verb 2017-07-19 20:33:16 -04:00
Anewbe
03df7a1eab Merge pull request #3608 from SpadesNeil/xenomeat-returns
Changes Spider meat back to Xeno meat
2017-07-19 12:47:36 -05:00
Cameron653
e158fcd3cc Macro Replacements. (#3574)
* A preface to my madness

Travis failed one of my PR's because I copied old code
that used /red /blue /green.

Because of this, I am going to find and replace every
instance of it that I find.

Also this is a test commit to make sure I'm comitting
to the correct branch.

* /blue /green /red replacements

Dear god.

A slow and painful death from acid is more fun than this.

I wouldn't wish this torture on my worst enemy.
And this is only the beginning

* Replace part 2.

Time to fix the human error.

* Fixes mismatches

* Sets macro count to 220

One above the current number of macros in the code.

* Fixes last of the mismatches.

* Removes spaces, replaces \black

Removes spaces
Replaces \black in a few areas where seen
Replaces \bold with <B> </B> where seen

* Updating macro count again

* More fixes!

* Issues fixed! For real this time!

I swear!

* Fixing all the merge conflict files.
2017-07-19 12:47:23 -05:00
Belsima
a3319de4f4 Adds a load of lore-friendly drinks & adjusts existing descriptions. (#3588)
* adds a load of lore-friendly drinks

* changelog

* uncomments radioactive drinks

:(

* nuka cola comeback

* Fixes the pull request.

* Makes drinks a bit more powerful.
2017-07-18 22:28:35 -05:00
Spades
350fa74c14 Changes Spider meat back to Xeno meat
But also changes a bad design choice and makes spider meat a viable
alternative to recipes requiring Xeno meat.

Now, for those of us who do still use xenos for things, xeno meat isn't
suddenly completely useless, while spiders still produce their own
unique meat that is usable in these recipes.
2017-07-17 04:45:40 -04:00
Anewbe
1f4e2d4a5b Caps the negative effects of the high-end drugs 2017-07-15 19:22:59 -05:00
Andrew
4b0549f946 Cyborg Item Changes
Research Cyborg
-Science gripper can now pick up health analyzers
-External organ gripper renamed to robotics organ gripper
-Robotics organ gripper can hold synthetic eyes
-Picking up brains has been moved to robotics organ gripper

Medical Cyborgs
-Chemistry gripper renamed to medical gripper
-Medical gripper can now hold pills and blood bags
-Crisis cyborgs now have crisis hyposprays which include dylovene
-Crisis cyborgs now have advanced burn and trauma kits instead of bruise
packs and ointment
-Surgeon cyborgs now have medical grippers
-Surgeon cyborgs now have surgeon hyposprays which replace tramadol with
oxycodone
-Oxycodone has been made scannable by health analyzers
-Surgeon cyborgs given a dropper to do the necrosis removal operation

Service Cyborgs
-Now have a multitool to cryogenically freeze plants
2017-07-11 20:09:19 -05:00
Cameron653
0a3a043cb6 Updates the block list in lunch.dm 2017-07-04 20:13:14 -04:00