Commit Graph

1907 Commits

Author SHA1 Message Date
Leshana
5d5f052eb7 Merge remote-tracking branch 'polaris-upstream/master' commit '613c5984eeeed2757fe7f15877973f81f526323c' into polaris-sync-2018-01-10
# Conflicts:
#	code/game/machinery/atmoalter/area_atmos_computer.dm
2018-01-15 13:27:39 -05:00
Arokha Sieyes
9a56c27c9f Merge pull request #2711 from VOREStation/aro-nifrep
Advanced NIF Repair Tool
2018-01-14 00:58:18 -05:00
Mechoid
ff02218ccb Hatchets - > Machete subtype. 2018-01-12 21:21:18 -08:00
Mechoid
5efc484595 Makes knives all knives. 2018-01-12 18:02:07 -08:00
Cyantime
ddf485273a vegitables 2018-01-11 22:37:23 -05:00
Leshana
807f1c7b4b Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09
# Conflicts:
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/structures/flora.dm
#
2018-01-09 14:40:09 -05:00
Arokha Sieyes
ea6ecca731 Advanced NIF Repair Tool
Creatable at the protolathe. Requires the same tech levels as the NIF, but no exotic materials.

It's a device that accepts nanopaste, and programs the nanite swarms into NIF repair swarms, which are a liquid reagent ingame. It has a 60u storage capacity, and needs to be emptied into any container.
From there, it can be injected via syringe, made into pills, or drank (though the latter two reduce effectiveness by 50%). Each unit nanopaste makes 15u repair nanites, so a full repair from 0% to 100% of a normal NIF requires 7 nanopaste converted to reagents (100u).
2018-01-08 17:14:56 -05:00
Cyantime
36f8c56537 Fixes 'varient' 2018-01-08 16:42:20 -05:00
Cameron653
5f2a7512e7 Lowers slime jelly cost, ups nutriment cost. 2018-01-07 00:35:30 -05:00
Cameron653
afaa89ff26 Makes alcohol have effects when injected. (#4471)
* Makes alcohol have effects when injected into veins

* Makes Ethyl work on it when in bloodstream.

Should work this way.

* No nutrition
2018-01-06 00:04:49 -05:00
Leshana
28c193cbdb Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04
# Conflicts:
#       code/game/objects/items/devices/communicator/communicator.dm
#       code/modules/client/preference_setup/occupation/occupation.dm
#       code/modules/mob/living/simple_animal/animals/cat.dm
#       code/modules/mob/mob_helpers.dm
#       code/unit_tests/zas_tests.dm
#       maps/southern_cross/southern_cross-1.dmm
#       maps/southern_cross/southern_cross-3.dmm
#       maps/southern_cross/southern_cross-6.dmm
#       vorestation.dme
2018-01-04 22:44:04 -05:00
mistyLuminescence
c443875898 Dropper and bloodpack improvements (#4453)
*Droppers transfer fractions adding to 1

*IV packs can be relabeled
2017-12-31 11:49:20 -08:00
Arokha Sieyes
d998f36c38 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync2018
# Conflicts:
#	code/game/objects/structures/signs.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/organs/organ_icon.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
2017-12-26 23:07:58 -05:00
mistyLuminescence
c986d57c34 Med Pill Blue Pill (#4404)
* Fixes 4412
* Rebalanced medical gear spawns
* Pill bottle code touched up
2017-12-23 14:45:24 -08:00
killer653
3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
Spades
54b5d74ada Revert "Chirret species" 2017-12-19 19:47:50 -05:00
mistyLuminescence
9a86b05471 Grind up some more stuff! (#4423)
*More types of sheets can be ground up in a grinder
2017-12-17 13:43:10 -08:00
killer653
7f70702f58 WIP. 2017-12-14 22:54:01 -05:00
OrbisAnima
24ceb65752 Port: Metamorphic Glasses (#4428)
* Port: Metamorphic Glasses

Basically, this just adds the old style glasses to the code without
removing anything.

https://imgur.com/eeqjW7c

Glasses can be found in the bar vendor, or can be ordered with the
bar/party supplies like any other glasses.

* Port: Metamorphic Glasses - Fix

Removed the relative path. Tested
2017-12-11 00:52:20 -06:00
Mewchild
e97b301838 Take two. New drinks (#4259)
* Adds new drinks

Adds many new drinks. Adds bitters, a staple for mixing.

* Fixes errors.

Also shut up travis :c

* Fixes Bitters/Buracao conflict

Makes it so that bitters require water and more enzyme, to avoid a
conflict with Blue Curacao

* Bitters use mint instead of orange

A more elegant solution to my last

* Removes duplicate

Rotgut was defined twice.

* Another duplicate

Mojito got defined twice.

* Adds Cold Front

Cold Front - 1 Iced Coffee, 1 Whiskey, 1 Mint. Lowers body temperature
by a severe amount. (Functionally the opposite of antifreeze)

* Fixes spacing issues

Changes Four Space to Tab indent

* Requested changes

Makes new milkshakes children of milkshake
Lowers Named Bullet slime jelly to 0.25u, down from 2u
Fixes a mismatch in amounts on the mint julep

* Fixed undefined drinks

Defines Mint Julep and Love potion
2017-12-09 16:25:06 -06:00
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
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