Commit Graph

1343 Commits

Author SHA1 Message Date
Novacat 4b2b3b3a2f Merge branch 'master' into upstream-merge-6882 2020-03-23 23:25:26 -04:00
Atermonera cbb40196fc Machinery: Always use update_use_power() 2020-03-23 23:21:10 -04:00
Atermonera 87333d9c25 Add mob/living stat setter and observer 2020-03-23 22:47:44 -04:00
Aronai Sieyes 36ee762c1a Mecha cloaking generator 2020-03-23 21:34:32 -04:00
Aronai Sieyes 3a0cbdb1b1 Mecha omni-shield generator 2020-03-23 21:34:32 -04:00
Aronai Sieyes 91d4e6897a Prosthetic Expansion: Advent of Species
Update robolimbs.dm
Update vorestation.dme
Update prosfab_designs.dm
Fix prosfab_designs.dm
2020-03-14 14:04:06 -04:00
Aronai Sieyes 52f6286256 Our one special VR construct moves to mechfab, and remove dupes 2020-03-11 16:35:05 -04:00
Atermonera e45a95d365 Robotics Expansion: RIG-ged and Ready 2020-03-11 15:56:18 -04:00
Mechoid acc712e1d5 Exosuit Expansion: Return of the Ripley 2020-03-08 00:52:32 -05:00
Novacat aabba971c6 Merge pull request #6626 from VOREStation/aro-discicons
New sprites for discs with unique colors
2020-03-01 10:52:13 -05:00
Novacat b44f8e0911 Merge pull request #6592 from VOREStation/vchat-rebase
VChat: Redone chat output in Vue.js
2020-03-01 10:51:29 -05:00
Aronai Sieyes 967fd17048 Rename to discs_vr.dmi and correct copypaste error 2020-02-29 10:37:41 -05:00
Atermonera 55704e0760 Merge pull request #6729 from Mechoid/RailgunFixxo
Fix and tweak station Railguns.
2020-02-24 16:15:04 -05:00
Atermonera 11eed81b92 Ports precision placement of items 2020-02-22 02:35:41 -05:00
Aronai Sieyes b3b51a7c3a New sprites for discs with unique colors
Now every disc has a unique color rather than most of them being the same and all of them being in cloning.dmi.

Sprites from CEV-Eris.
2020-02-20 21:37:15 -05:00
Arokha Sieyes 1d9e5be122 Replace \image macro with bicon() 2020-02-19 19:55:01 -05:00
Arokha Sieyes 47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Novacat 1688d86772 Merge pull request #6478 from VOREStation/upstream-merge-6621
[MIRROR] Moar descriptions for things
2020-01-21 01:33:06 -05:00
Novacat 5cac43ef0e Merge pull request #6480 from VOREStation/upstream-merge-6628
[MIRROR] Adds a mega cooking recipe
2020-01-21 01:26:48 -05:00
Atermonera 5bcb9cc934 Fix various syntactic problems 2020-01-21 01:06:04 -05:00
Atermonera d10a72a77f Adds a mega cooking recipe 2020-01-20 23:15:01 -05:00
Atermonera 9b93339969 Moar descriptions for things 2020-01-20 22:50:39 -05:00
Atermonera 7ae5204eaf Merge pull request #6619 from Shadow-Quill/Chem-Master-Building
Can now (de)construct chem masters
2020-01-15 23:16:19 -05: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
Anewbe 249a05e888 Merge pull request #6554 from Nalarac/Cellicon
Protolathe Power Cells Tweak
2019-11-29 19:49:48 -05:00
Mechoid 169d8acedd Medical Expansion 2019-10-19 23:28:38 -04: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
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