Commit Graph

1650 Commits

Author SHA1 Message Date
Verkister
cce138b094 Makes player simplemobs able to finish off snacks.
No more endless futile nibbling. Tested working fine.
2017-12-06 20:57:54 +02:00
Anewbe
d2a90fcec4 Fixes High Cap water tanks, lets drones move tanks again. 2017-12-04 17:43:57 -06:00
Neerti
af5c633cdb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/28/2017_new_blob
# Conflicts:
#	code/game/atoms_movable.dm
2017-11-29 22:43:05 -05:00
Neerti
acb208dd3f Works on New Blob 2017-11-29 22:35:01 -05:00
Neerti
2f7db506eb Adds Variable Click Delay
Now certain weapons can strike faster or slower than usual. No weapons currently do this as this PR just lays the groundwork for that.
The click delay can also be modified with traits. The slime agility modifier makes attacks happen 25% sooner.
Adds debug test verb to display a weapon's DPS. It's really basic but should be sufficient for future force adjustments I might do in the future.
2017-11-28 16:11:56 -05:00
Mechoid
c505b7883f Merge pull request #4329 from Anewbe/synthblood
Creates synthblood reagent, adds it to merc medic borg hyposprays
2017-11-27 16:15:35 -08:00
Anewbe
1d9af61ff0 Adds a cap to losebreath 2017-11-26 21:55:55 -06:00
mistyLuminescence
1f84c0c8ee Drinking changes 2017-11-24 00:59:45 +00:00
Anewbe
0e726d595e Removes synthblood from the surgeon borg 2017-11-23 01:46:54 -06:00
Anewbe
ec59a15bdf Creates synthblood reagent, adds it to surgeon borg hyposprays 2017-11-22 17:44:01 -06:00
Mechoid
d5404ae0eb Adds More Spiders. Touches cuff-code tangentially. 2017-11-21 12:59:06 -08: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
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
Wickedtemp
a3ba6ff5d9 Update hypospray.dm 2017-10-31 20:52:02 -05: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
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
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
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
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
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
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