Hawk_v3
a333c03a3c
Merge remote-tracking branch 'upstream/release'
2019-09-14 17:10:36 +01:00
Heroman
31d459f230
Fixes Blood-Onator
2019-09-14 15:01:58 +10:00
Hawk_v3
6d4ec50e08
Merge remote-tracking branch 'upstream/master'
2019-09-01 19:02:01 +01:00
Unknown
0d73c8ad76
Early Polaris Ports
...
Ports Polaris PRs 6424, 6426, 6428, 6430, 6431, 6432, 6433, and 6434
No vorestation edit markings because they are polariscode ports.
2019-08-30 23:55:58 -04:00
Hawk_v3
b6ebecf7ec
Merge remote-tracking branch 'upstream/master'
2019-08-30 21:38:17 +01:00
Unknown
14eb525030
Adjusts Vorestation pills and pillbottles
2019-08-28 04:06:19 -04:00
Hawk_v3
0f3c802427
Merge remote-tracking branch 'upstream/master'
2019-08-22 21:32:01 +01:00
Novacat
775d175b11
Merge pull request #5682 from VOREStation/upstream-merge-6358
...
[MIRROR] Exploration Expansion 1: Or, How I Learned To Love The Tree
2019-08-21 18:02:59 -04:00
Atermonera
8f067fe785
Chemistry Expansion
2019-08-21 17:43:01 -04:00
Mechoid
ae48659a68
Exploration Expansion 1: Or, How I Learned To Love The Tree
2019-08-21 17:23:07 -04:00
Hawk_v3
96b8a7ab95
Merge remote-tracking branch 'upstream/master'
2019-08-17 21:06:48 +01:00
Novacat
dd7a7842ed
Merge pull request #5567 from Novacat/nova-survival
...
Adds Prototype Hypospray
2019-08-12 13:15:35 -04:00
Hawk_v3
0c85b3a4dd
Merge remote-tracking branch 'upstream/master'
2019-08-09 21:35:04 +01:00
Atermonera
0469a309cc
Adds NOCONDUCT to Some Items
2019-08-08 16:07:50 -04:00
Novacat
8e321b3725
Update hypospray.dm
2019-08-06 22:10:50 -04:00
Unknown
d7406088b5
Test
2019-08-06 21:07:40 -04:00
Unknown
b5824871ed
Removes unnecessary check
2019-08-06 21:05:51 -04:00
Unknown
03976d3dd3
Moves var
2019-08-06 21:03:35 -04:00
Unknown
f699825119
Forgot a Var
2019-08-06 20:58:25 -04:00
Unknown
1fb88e40e2
Adds Prototype Hypospray
...
- Can be researched and manufactured by Science
- Identical to a mk1 hypospray, except does not instantly inject reagents at friendly intents
Not terribly useful right now under the current meta, but probably will be useful down the road if/when syringes become disposable again.
2019-08-06 20:54:14 -04:00
Andrew
69ed422019
Adds Laser Tag Turrets Plus Changes ( #6324 )
...
* Adds Laser Tag Turrets
* Adds changelog
* Reverts Lethal Turrets Shooting to Kill
* Small No Longer Means Misc Life
* Revert "Merge branch 'master' into Turret"
This reverts commit 0300e6723b1aec0c47f8f82f7db770aa29af2483, reversing
changes made to 219348783d49b3205c3ed64bdd604f61791e6e72.
* Revert "Revert "Merge branch 'master' into Turret""
This reverts commit ca3d13b3372f2c5587d8d2cc449a6da8503494e4.
* Github why
* Change laser.dm to master?
* Revert "Change laser.dm to master?"
This reverts commit da562f6bc1ec43fe0cf5fe6ec5af61ada3474dd9.
2019-07-27 15:45:58 -04:00
Hawk_v3
2a73ca4304
Merge remote-tracking branch 'upstream/master'
2019-07-23 22:51:24 +01:00
Atermonera
6a12033368
Merge pull request #6321 from Nalarac/patch-2
...
Allows Longer Visible Text on Beakers
2019-07-22 00:44:19 -04:00
Hawk-v3
0385bab820
Vermitol change.
...
No, Vermicetol is burn based. It uses burn base chemicals.
2019-07-20 22:38:19 +01:00
Hawk_v3
8654b6bdf4
Merge remote-tracking branch 'upstream/master'
2019-07-19 22:05:31 +01:00
Novacat
b039eacdd7
Merge pull request #5429 from Novacat/nova-basicfixes
...
Ease of Eating Changes
2019-07-17 17:35:58 -04:00
Atermonera
d987e1e7fd
Merge pull request #6301 from Cerebulon/saltoid
...
Salt is Salt
2019-07-16 00:49:52 -04:00
Atermonera
257e3dd9fc
Merge pull request #6287 from Wickedtemp/master
...
Allows Set Transfer Amounts of 250 and 500 for Reagent Cartridges
2019-07-12 02:51:39 -04:00
Hawk_v3
4668b23fea
Merge remote-tracking branch 'upstream/master'
2019-07-10 01:50:50 +01:00
Atermonera
1472642b88
Merge pull request #6262 from Mechoid/CivilianExpansion1
...
Civilian Expansion 1: The Plantening
2019-07-07 17:29:32 -04:00
Novacat
baa2d5805b
Update Chemistry-Recipes_vr.dm
2019-07-06 16:17:10 -04:00
Unknown
e18440a991
Recommended suggestions
2019-07-06 15:36:44 -04:00
Unknown
a5961d8e0e
Ease of Eating Changes
...
On request from Duke
- Microwave cooking times cut to 25% of normal times
- You now need 1/5 of the amount of clonexcadone for meat
- Cargo pizzas start out cooked
2019-07-04 21:32:52 -04:00
Hawk_v3
bc7ea8379a
Merge remote-tracking branch 'upstream/master'
2019-07-02 17:54:29 +01:00
GeneriedJenelle
12df030c0a
Adds Cider Bottles ( #6201 )
...
* Adds Cider
How has SS13 alcohol gone on so long without cider? Let's fix that.
* Update cartridge_presets.dm
* Update dispenser2_energy.dm
* Update dispenser_presets.dm
* Adds cider bottle sprite + adds to borgs
* Update Chemistry-Reagents-Food-Drinks.dm
* Removes additional cider entry
2019-06-18 20:05:06 -04:00
Hawk_v3
5ec6b3294e
Merge remote-tracking branch 'upstream/master'
2019-06-18 01:26:30 +01:00
Novacat
b7205d3b60
Update pill.dm
2019-06-16 21:51:52 -04:00
Novacat
13739440c2
Grey scale pills and colored pillbottles
2019-06-16 21:28:56 -04:00
Hawk_v3
132f11f45a
Merge remote-tracking branch 'upstream/master'
2019-06-13 18:50:58 +01:00
Spades
fafd7675ef
Merge pull request #4986 from Heroman3003/zoooooooom
...
Rebalances zoom pills
2019-06-12 17:11:48 -04:00
Hawk_v3
129ac045e7
Merge remote-tracking branch 'upstream/master'
2019-06-12 18:47:10 +01:00
Neerti
21244ade2f
Merge pull request #6204 from Ketrai/worms
...
Adds worms
2019-06-11 17:35:11 -04:00
Heroman
2de30ebaf7
Removes fertilizer aspect
2019-06-02 07:09:44 +10:00
Hawk_v3
470c86fb45
Merge remote-tracking branch 'upstream/master'
2019-05-08 19:59:55 +01:00
Novacat
b7761ee3ef
Update Chemistry-Recipes.dm
2019-05-06 14:18:39 -04:00
Atermonera
90ee680dd5
Fishing!
2019-05-06 14:16:27 -04:00
Novacat
048760f2ea
Update Chemistry-Holder.dm
2019-05-05 14:17:53 -04:00
Atermonera
1757c30075
Ports #6039 with Virgo Fixes
2019-05-05 14:14:37 -04:00
Hawk_v3
27e73883fc
Merge remote-tracking branch 'upstream/release'
2019-05-04 21:03:48 +01:00
Unknown
eeb198d3a4
Metabolism effects
2019-05-02 19:41:17 -04:00
