Commit Graph

1576 Commits

Author SHA1 Message Date
killer653
70e53b96bb Polaris Sync 2017-11-10 11:37:41 -05:00
Anewbe
35fc43d579 Merge pull request #4112 from Woodratt/WR_10192017
High Capacity Water Tanks
2017-11-05 20:11:23 -06:00
Woodratt
114d391bb9 High Capacity Water Tanks
- Adds in code and sprites for high capacity water tanks. 5 times the volume of a regular one.
- [Edit] Uses the regular fuel tank and water tank sprites.
2017-11-04 22:41:28 -07:00
killer653
11c195debb Polaris Sync 2017-11-04 13:37:13 -04:00
mistyLuminescence
41f332df42 fuck this pr PART TWO 2017-11-04 00:00:07 +00:00
mistyLuminescence
a0c5ecb8d5 UPDATES IT FOR REAL THIS TIME 2017-11-03 23:29:14 +00:00
Neopatra
2f575ce971 Fixed Deathbell Color
Does that. Fixes Color.
2017-11-02 21:38:00 -04:00
Neopatra
6e864d6492 Adds Deathbell Recipie
Makes Deathbells mixable.
2017-11-02 21:21:13 -04:00
Neopatra
946329df87 Adds Deathbell Drinks
Adds Serana Te'saln's Deathbells to the code.
2017-11-02 21:14:18 -04:00
Wickedtemp
a3ba6ff5d9 Update hypospray.dm 2017-10-31 20:52:02 -05:00
killer653
0c480ec15f Polaris sync 2017-10-27 15:30:24 -04:00
Cameron653
9eac4c3996 Update blood_pack_vr.dm 2017-10-26 23:49:25 -04:00
Cameron653
0a046e364a Makes bloodbags have 10 uses. 2017-10-26 23:13:02 -04:00
Anewbe
804630382f Adds a cap to bicard overdose eye_blurry 2017-10-25 04:39:34 -05:00
Anewbe
7a36a8cfb6 Merge pull request #4118 from mistyLuminescence/cryostorage
Reworks cryopod storage
2017-10-22 19:03:07 -05:00
Cameron653
58bcdf46e2 fuck 2017-10-22 12:31:38 -04:00
Anewbe
6a52111680 Merge pull request #4116 from Neerti/10/20/2017_syndie_borgs_are_back
Syndicate Borgs II, Return of the Salt
2017-10-21 13:58:52 -05:00
Neerti
083369c614 Update borghydro.dm 2017-10-21 10:42:53 -04:00
Cameron653
25ae5840e4 Lets blood bags be drank in increments 2017-10-20 17:16:22 -04:00
Cameron653
43f7518e79 Lets vampires actually drink blood 2017-10-20 17:14:33 -04:00
mistyLuminescence
ae308a3a91 Reworks cryopod storage 2017-10-20 19:14:45 +01:00
Anewbe
52cbe08c76 Should be able to transfer reagents between glasses again 2017-10-20 12:56:07 -05:00
Neerti
9c0ac5ec2a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/20/2017_syndie_borgs_are_back 2017-10-20 13:26:06 -04:00
Neerti
1aff3fc8c0 Syndicate Borgs II, Return of the Salt
Adds an option in mercenary uplinks to purchase three different 'classes' of drones.
See PR for more details.
2017-10-20 13:01:45 -04:00
Anewbe
c11fee54a4 Removes mrate_static on some chems 2017-10-17 23:39:03 -05:00
killer653
1bb71ef429 Polaris Sync 2017-10-16 22:16:24 -04:00
Ansari
768dc2d7c0 Port over Chemistry bag from Paradise (#4067)
* Add in chemistry bag from Paradise, based on /tg/ bag. Add it to biogenerator. Add it to wardrobe.

* Make itemsize large so it cannot be put in backpack. Slowdown = 1.
2017-10-15 15:04:56 -05:00
Neerti
a8513844ec Adds a Trait system (#4048)
* Works on trait system, wip.

* Finalizes traits.
Fixes a few bugs with medical machines assuming a max health of 100.
2017-10-13 01:17:39 -05:00
elgeonmb
251f5a4139 Adds drink fluff; fixes drink descriptions (#4038)
* It's not all Morpheus this time (#1)

* drink fluff

* changes drink descriptions to suck less

* Update containers.dm

* Update bottle.dm
2017-10-12 23:01:24 -05:00
Cameron Lennox
15a6472d14 Pol Sync 2017-10-08 17:44:25 -04:00
Cameron653
b50f067a41 Allows acquisition of mutation toxin
For adv mutation toxin, 
bdf5ce72f8/code/modules/reagents/Chemistry-Recipes_vr.dm (L237)

This reaction has to occur.
2017-10-07 16:01:02 -04:00
killer653
a399fd09e0 Promethean fix & readding slime mutation toxins 2017-10-03 18:45:10 -04:00
elgeonmb
e5474c2dc1 Food fluff (#4008)
* food fluff

* Update polaris.dme

* what the hell is Jargon 4

* screeching

* somehow that last one broke something

* how can I not spell vacuum
2017-10-02 19:59:00 -05:00
Ketrai
12ea8d0d8d updates grub-food
Makes it so you can slice the bugball food item as intended, so you can decontaminate it before serving.

(previously the bugball had to be decontaminated, bitten open, then decontaminated again to avoid poison)
2017-10-01 13:20:10 +02:00
killer653
da09bbdc17 Suck Ze Bloodbags 2017-09-29 23:30:29 -04:00
killer653
1f48f84734 Adds bloodsucker trrait 2017-09-29 23:07:36 -04:00
Anewbe
73ca1f1803 Less meat from Clonex+Blood 2017-09-29 16:48:02 -05:00
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