cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-31 09:09:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
50,021 Commits 13 Branches 0 Tags
7035e30fc3bca9eb12bdabed92adb2dc55b452de
Commit Graph
1019 Commits
Author SHA1 Message Date
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
NovacatandGitHub 794bf4c648 Update weapons.dm 2019-09-26 03:10:04 -04:00
AtermoneraandVirgoBot 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
TrilbyspacecloneandGitHub 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
MechoidandVirgoBot ae48659a68 Exploration Expansion 1: Or, How I Learned To Love The Tree 2019-08-21 17:23:07 -04:00
NovacatandGitHub dd7a7842ed Merge pull request #5567 from Novacat/nova-survival 
Adds Prototype Hypospray
 2019-08-12 13:15:35 -04:00
NovacatandGitHub 75e53b8fc9 Update mechfab_designs.dm 2019-08-08 16:30:44 -04:00
NovacatandGitHub eced9eda28 Update circuits.dm 2019-08-08 16:30:08 -04:00
AndrewandVirgoBot 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
AnewbeandVirgoBot 341832b995 Merge pull request #6364 from Nalarac/Mecha2 
Fixes Ripley Speedboost Being Uncreatable
 2019-08-02 13:57:07 -04:00
AtermoneraandVirgoBot 60c415cf64 Adds shutoff valve monitor 2019-07-30 20:04:51 -04:00
AtermoneraandVirgoBot f0311ed4ff Merge pull request #6304 from Nalarac/Mecha2 
Adds Ripley Speedboost Equipment
 2019-07-24 00:02:48 -04:00
NovacatandGitHub d5f0f35519 Merge pull request #5357 from Wickedtemp/master 
Allows New Serenity Mech To Be Constructed
 2019-07-17 17:35:41 -04:00
AtermoneraandVirgoBot 9325f590ca Mining Expansion, the Diggening. 2019-07-13 03:48:38 -04:00
AtermoneraandVirgoBot 4f601a94b8 Merge pull request #6248 from Heroman3003/gpsing 
Adds more GPS variety
 2019-07-01 20:47:22 -04:00
AndrewandVirgoBot 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
WickedtempandGitHub 1a01bd076f Update mechfab_designs.dm 2019-06-22 00:03:59 -05:00
WickedtempandGitHub 82422d9a75 Update circuits.dm 2019-06-22 00:02:58 -05:00
WickedtempandGitHub 3e76dff71c Merge pull request #1 from Wickedtemp/Wickedtemp-patch-1 
Update mechfab_designs.dm
 2019-06-21 02:40:54 -05:00
WickedtempandGitHub 328c88f175 Update circuits.dm 2019-06-21 02:40:38 -05:00
WickedtempandGitHub 65c38bd9e6 Update mechfab_designs.dm 2019-06-21 02:38:46 -05:00
mistyLuminescenceandVirgoBot 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
MechoidandVirgoBot 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
NeertiandVirgoBot 5a3040a08d Merge pull request #6183 from Mechoid/FixPrecursotechOversights 
Fixes some Precursotech oversights.
 2019-05-31 22:18:00 -04:00
AtermoneraandVirgoBot 8e724ad32c Merge pull request #6133 from Heroman3003/cart-tweek 
Minor PDA cartridge tweaks
 2019-05-01 14:08:33 -04:00
NeertiandVirgoBot 16b3b58259 [REVIEW] Ports Modular Computers from Baystation 2019-04-28 22:06:40 -04:00
NovacatandGitHub 6a287c7e1f Merge pull request #5085 from VOREStation/upstream-merge-6026 
[MIRROR] Precursotech Janus
 2019-04-18 02:19:31 -04:00
MechoidandVirgoBot fc43527ac7 Adds Robobags (#6059) 
* Adds Robobags

* Finishes robobags

* FixFix
 2019-04-18 01:40:39 -04:00
AtermoneraandVirgoBot b7e9934206 Precursotech Janus 2019-04-18 00:33:20 -04:00
Layla Crosse/Occula DrennandVirgoBot 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
NeertiandVirgoBot 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
NovacatandGitHub f391ddad02 Merge pull request #5038 from VOREStation/upstream-merge-6028 
[MIRROR] Precursotech Tools
 2019-04-14 02:29:25 -04:00
NeertiandVirgoBot 9c28b82c6c Merge pull request #6028 from Mechoid/Precursotech_Tools 
Precursotech Tools
 2019-04-14 02:20:07 -04:00
NeertiandVirgoBot 94e6cc402b Merge pull request #6027 from Mechoid/Precursotech_Sword 
Anomalotech Charge Sword
 2019-04-14 01:21:05 -04:00
NeertiandVirgoBot fc7c6f38b4 Base features for Precursotech and Anomalotech Expansion 2019-04-13 22:44:52 -04:00
NovacatandGitHub 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
NeertiandVirgoBot 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
NeertiandVirgoBot fdeb9e3ac9 Merge pull request #6020 from Hatterhat/patch-1 
protolathes actually ACTUALLY update properly
 2019-03-29 08:43:21 -04:00
SpadesandNovacat a184e67c93 Changes (R&D made) Saber SMG to Advanced SMG 2019-03-28 18:22:23 -04:00
NovacatandGitHub 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
NovacatandGitHub 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
kevinz000andNovacat 6415e4193f [READY]Makes a bunch of processes subsystems instead 2019-03-27 16:03:51 -04:00
NeertiandNovacat fe0b7373b3 Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it 2019-03-27 14:49:30 -04:00