RadiantFlash7
c98003a013
Fixes wine vats and all errors from travis
...
Fixes wine vats and all errors from travis
2019-12-12 18:41:21 -05:00
Repede
3c9731879a
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map
2019-12-09 17:15:36 -05:00
Repede
0159234240
Fixes outdoor platings
...
Phororeagent fixes
2019-12-09 12:04:41 -05:00
Hawk_v3
5b13642c12
Merge remote-tracking branch 'upstream/master'
2019-12-08 18:15:35 +00:00
Unknown
ea4c6075b7
Fixes busted syringes
2019-12-07 10:25:28 -05:00
Repede
9c61982751
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map
...
# Conflicts:
# code/game/machinery/vending_yw.dm
# icons/vore/custom_clothes_yw.dmi
# vorestation.dme
2019-11-29 19:13:53 -05:00
Hawk_v3
a5c7909ed7
Merge remote-tracking branch 'upstream/master'
2019-11-17 12:42:55 +00:00
Meghan-Rossi
03c82caa71
Makes Monster Tamer give nutrition
...
Seems to have been intended anyway but wasn't working because the nutriment factor was zero. Made it work similar to protein since it's made with protein
2019-11-16 14:35:38 +00:00
Novacat
dcd5900f83
Update Chemistry-Reagents-Food-Drinks.dm
2019-11-10 22:04:40 -05:00
Anewbe
c9abdaabe9
Stop protein's affect_ingest calling nutriment's affect_ingest twice
2019-11-10 21:49:51 -05:00
Hawk_v3
f976948ce3
Merge remote-tracking branch 'upstream/master'
2019-11-07 19:54:10 +00:00
Mechoid
e1fa847bc2
Xenowork Prep For Future ( #6491 )
...
* Xenowork, weeds walls and material blobs.
* More weeds
* XenoUpdoots
* Stop that, me.
2019-11-04 21:38:02 -05:00
Hawk_v3
3c8cd11eac
Reupdated Station 1 map
2019-10-24 21:57:58 +01:00
Mechoid
169d8acedd
Medical Expansion
2019-10-19 23:28:38 -04:00
Hawk_v3
2cc8800ede
Merge remote-tracking branch 'upstream/master'
2019-10-08 15:14:36 +01:00
Novacat
369b9a0914
Merge pull request #6039 from Screemonster/chimeratweaks
...
chimera examinetext
2019-10-07 15:51:18 -04:00
Screemonster
513f59ea92
chimera examinetext
2019-10-06 20:14:26 +01:00
Atermonera
89aad128cf
Blind port of Bay Radiation Subsystem
2019-10-06 03:30:36 -04:00
Hawk_v3
2438f40804
Map Staging things and Runtime fixing.
2019-10-06 02:29:49 +01:00
Hawk_v3
74cc210e21
Merge remote-tracking branch 'server/master' into map
2019-10-05 23:10:09 +01:00
Hawk_v3
6e801b1e8e
Map Updates.
2019-10-04 01:52:44 +01:00
Cebutris
aceee25d08
YW edit properly
2019-10-01 17:13:56 -04:00
Cebutris
b9c1c1995b
adds papereating
2019-10-01 17:03:30 -04:00
Unknown
fdca4f7554
Master Runtime Fix
2019-10-01 03:09:58 -04:00
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
