Razgriz
de24521619
First merge from upstream
2020-01-13 17:23:01 -07:00
Sharkmare
f568be89d9
The cake, Serg event. ( #120 )
...
Adds items for an event, Made by Shadowfire117 and Ketrai
2020-01-11 00:20:57 +01:00
DHA
b93f5a2fa4
ML3M and NFSW gun research removal
...
Removed from science research, but they are still in the code. This is to remove them from play. Reasons for removal are too complicated to state here.
2019-12-27 08:48:37 -08:00
Hawk_v3
6b935d64ec
Merge remote-tracking branch 'upstream/master'
2019-12-21 21:57:49 +00:00
Meghan-Rossi
604fd1b74f
Resolve conflicts, fix compile errors
2019-12-19 17:49:21 +00:00
Atermonera
3b7a737c08
Change various global species lists to GLOB versions, adds 2 more event subspecies.
2019-12-16 00:52:29 -05:00
Hawk_v3
5b13642c12
Merge remote-tracking branch 'upstream/master'
2019-12-08 18:15:35 +00:00
Anewbe
249a05e888
Merge pull request #6554 from Nalarac/Cellicon
...
Protolathe Power Cells Tweak
2019-11-29 19:49:48 -05:00
Hawk-v3
c7e41b1c24
Merge branch 'master' into master
2019-11-02 10:43:44 +00:00
RadiantFlash7
8cca4cb043
Comments out Stripper cell
...
...We do not need to give science the ability to instantly strip anyone, including ERT, Deathsquad, etc..
This was a bad idea all around.
2019-11-01 23:56:47 -04: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
Repede
22e602deb3
Merge branch 'master' into larger_bodybags
2019-10-17 20:09:00 -04:00
TrilbySpaceClone
77b13577a1
grave storge
2019-10-16 21:18:18 -04:00
Hawk_v3
8edc441c63
Renames for descriptiveness.
...
R&D now knows exactly what every device is.
2019-10-12 21:43:52 +01:00
Trilbyspaceclone
56dde59333
Update power_cells.dm
2019-10-09 11:52:26 -04:00
Trilbyspaceclone
f3b8e49fbd
Update power_cells.dm
2019-10-09 11:47:29 -04:00
Trilbyspaceclone
adf9ff0cf1
corrects item paths
...
cells were already taken, my bad
2019-10-09 11:26:36 -04:00
Hawk-v3
9f3802b9a0
Revert "Adds in two new cells for sci to get!"
2019-10-09 16:14:07 +01:00
TrilbySpaceClone
c245955ead
Suggestions
2019-10-05 22:20:05 -04:00
Trilbyspaceclone
5eae6a4200
Update power_cells.dm
...
Why did this complie locally?
2019-10-05 18:42:17 -04:00
TrilbySpaceClone
af68971451
maybe it just works
...
whom knows
2019-10-05 18:12:59 -04:00
Hawk_v3
691a1239f4
Merge from Vorestation
2019-09-29 21:53:09 +01:00
Heroman
3ea943f9ad
Sorts vorestation-only rnd recipies
2019-09-26 18:41:54 +10:00
Novacat
794bf4c648
Update weapons.dm
2019-09-26 03:10:04 -04:00
Atermonera
0b31dcace5
Properly sorts all protolathe designs
2019-09-26 03:00:43 -04:00
Hawk_v3
b22f2284fe
Merge remote-tracking branch 'upstream/master'
2019-09-23 20:55:18 +01:00
Trilbyspaceclone
0a6dace356
Update medical.dm
2019-09-18 20:14:50 -04:00
Heroman3003
caf274951c
Implements ML-3M, Adds prototype NSFW
2019-09-17 11:24:58 +10:00
Unknown
e404d95df0
Adds rig modules to R&D
2019-09-09 10:23:19 -04:00
Mechoid
ae48659a68
Exploration Expansion 1: Or, How I Learned To Love The Tree
2019-08-21 17:23:07 -04:00
Novacat
dd7a7842ed
Merge pull request #5567 from Novacat/nova-survival
...
Adds Prototype Hypospray
2019-08-12 13:15:35 -04:00
Novacat
75e53b8fc9
Update mechfab_designs.dm
2019-08-08 16:30:44 -04:00
Novacat
eced9eda28
Update circuits.dm
2019-08-08 16:30:08 -04:00
Andrew
9d93bea992
Allows Construction of Serenity in Robotics
2019-08-08 16:28:07 -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
Anewbe
341832b995
Merge pull request #6364 from Nalarac/Mecha2
...
Fixes Ripley Speedboost Being Uncreatable
2019-08-02 13:57:07 -04:00
Atermonera
60c415cf64
Adds shutoff valve monitor
2019-07-30 20:04:51 -04:00
Atermonera
f0311ed4ff
Merge pull request #6304 from Nalarac/Mecha2
...
Adds Ripley Speedboost Equipment
2019-07-24 00:02:48 -04:00
Novacat
d5f0f35519
Merge pull request #5357 from Wickedtemp/master
...
Allows New Serenity Mech To Be Constructed
2019-07-17 17:35:41 -04:00
Atermonera
9325f590ca
Mining Expansion, the Diggening.
2019-07-13 03:48:38 -04:00
Atermonera
4f601a94b8
Merge pull request #6248 from Heroman3003/gpsing
...
Adds more GPS variety
2019-07-01 20:47:22 -04:00
Andrew
586ad2906e
Adds Material Scanner to Protolathe ( #6235 )
...
* Adds Material Scanner to Protolathe
Adds the optical material scanner to the protolathe (the ones miners get).
Costs 50 steel and 50 glass (same as all the other HUDs)
Required tech is 3 magnet and 3 engineering (same as on the HUD)
Also adjusts the meson design so it actually uses its parent code like the other HUDs
* Changes sorting string
2019-06-28 21:22:09 -04:00
Wickedtemp
1a01bd076f
Update mechfab_designs.dm
2019-06-22 00:03:59 -05:00
Wickedtemp
82422d9a75
Update circuits.dm
2019-06-22 00:02:58 -05:00
Wickedtemp
3e76dff71c
Merge pull request #1 from Wickedtemp/Wickedtemp-patch-1
...
Update mechfab_designs.dm
2019-06-21 02:40:54 -05:00
Wickedtemp
328c88f175
Update circuits.dm
2019-06-21 02:40:38 -05:00
Wickedtemp
65c38bd9e6
Update mechfab_designs.dm
2019-06-21 02:38:46 -05:00
mistyLuminescence
e50b9d0cc0
Serenity ( #6208 )
...
* Serenity
* travis
* adminspawn
* I greatly appreciate all detailed and informative feedback provided. Per request, the Serenity is currently adminspawn-only; a new PR will be made in two weeks to add it to Robotics and resolve any issues encountered during the testing period.
* Comments out circuit for two-week testing period
2019-06-21 00:14:05 -04:00
Mechoid
07cceab5bc
Fixes the Chargeblade's tech cost. ( #6216 )
...
* Fixes the Chargeblade's tech cost.
* Update illegal.dm
2019-06-16 21:17:26 -04:00
