cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,565 Commits 8 Branches 0 Tags
fec8571d65030704b4f72c2912e1f3cec8537fd6
Commit Graph

1020 Commits

Author SHA1 Message Date
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
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
Neerti
5a3040a08d Merge pull request #6183 from Mechoid/FixPrecursotechOversights 
Fixes some Precursotech oversights.
 2019-05-31 22:18:00 -04:00
Atermonera
8e724ad32c Merge pull request #6133 from Heroman3003/cart-tweek 
Minor PDA cartridge tweaks
 2019-05-01 14:08:33 -04:00
Neerti
16b3b58259 [REVIEW] Ports Modular Computers from Baystation 2019-04-28 22:06:40 -04:00
Novacat
6a287c7e1f Merge pull request #5085 from VOREStation/upstream-merge-6026 
[MIRROR] Precursotech Janus
 2019-04-18 02:19:31 -04:00
Mechoid
fc43527ac7 Adds Robobags (#6059) 
* Adds Robobags

* Finishes robobags

* FixFix
 2019-04-18 01:40:39 -04:00
Atermonera
b7e9934206 Precursotech Janus 2019-04-18 00:33:20 -04:00
Layla Crosse/Occula Drenn
dde5133e03 Research QoL changes (#6042) 
* Research QoL changes

* Reverts changes relating to blanket print times and Protolathe storage

* Actually changes the design print time.

Why do you hate me github.

* Fixes an enter key error caused by the editor.

* Actually does all of the things I needed to do like a smart person

Which apparently I am not.

* Fixes a newline

Because goddamn it the online editor hates me too.
 2019-04-17 04:51:29 -04:00
Neerti
f15c5bf29b Merge pull request #6095 from Heroman3003/unduping-synths 
Fixes synthesisers inserting more materials than they had
 2019-04-17 02:36:46 -04:00
Novacat
f391ddad02 Merge pull request #5038 from VOREStation/upstream-merge-6028 
[MIRROR] Precursotech Tools
 2019-04-14 02:29:25 -04:00
Neerti
9c28b82c6c Merge pull request #6028 from Mechoid/Precursotech_Tools 
Precursotech Tools
 2019-04-14 02:20:07 -04:00
Neerti
94e6cc402b Merge pull request #6027 from Mechoid/Precursotech_Sword 
Anomalotech Charge Sword
 2019-04-14 01:21:05 -04:00
Neerti
fc7c6f38b4 Base features for Precursotech and Anomalotech Expansion 2019-04-13 22:44:52 -04:00
Novacat
ab5710a015 Merge pull request #4881 from Heroman3003/borg-resization 
Borgs are now in on fun of size-related features
 2019-04-11 12:35:21 -04:00
Neerti
1d59d8683c Replaces AI-controlled Maint Drones with AI-controlled Borg Shells 2019-04-06 05:07:05 -04:00
Unknown
f653b21d41 Removes Phase weapons from R&D 2019-03-29 23:07:50 -04:00
Heroman
92956bc258 Added sizechanging module and size pref respect for borgs 2019-03-30 07:56:33 +10:00
Neerti
fdeb9e3ac9 Merge pull request #6020 from Hatterhat/patch-1 
protolathes actually ACTUALLY update properly
 2019-03-29 08:43:21 -04:00
Spades
a184e67c93 Changes (R&D made) Saber SMG to Advanced SMG 2019-03-28 18:22:23 -04:00
Novacat
01769ada6b Merge pull request #4686 from VOREStation/upstream-merge-5840 
[MIRROR] protolathe screen updates mat cost with better manips
 2019-03-27 18:01:11 -04:00
Novacat
dce3466f3b Merge pull request #4684 from VOREStation/upstream-merge-5814 
[MIRROR] [READY]Makes a bunch of processes subsystems instead
 2019-03-27 17:46:31 -04:00
kevinz000
6415e4193f [READY]Makes a bunch of processes subsystems instead 2019-03-27 16:03:51 -04:00