cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
61,732 Commits 6 Branches 0 Tags
1707a6d22be9fe5c865d08d5c33f9821902f1fa0
Commit Graph

1167 Commits

Author SHA1 Message Date
cadyn
6e569ca7de Merge pull request #1209 from MisterGrimm/GammaJamma 
Adds the GA-X Experimental Gamma Laser for mechs
 2021-02-03 13:16:02 -08:00
Sym
55a6523bc0 Adds Gamma Laser for mech, tweaks gamma laser 
Tweaking Gamma Laser projectile to be used in mech weapon
 2021-01-29 15:04:36 -05:00
Razgriz
99d137254d Merge pull request #1196 from CHOMPStationBot/upstream-merge-9614 
[MIRROR] Fixes hound belly expansion upgrade having wrong name in prosfab, tweaks tech reqs, makes name less wordy
 2021-01-27 18:43:55 -07:00
Cadyn
00bc513e6e Implementing TGSQL security 2021-01-27 10:51:12 -08:00
Novacat
2f8602243d Merge pull request #9614 from Heroman3003/belly-cap-fix-rename 
Fixes hound belly expansion upgrade having wrong name in prosfab, tweaks tech reqs, makes name less wordy
 2021-01-27 02:24:52 +00:00
Cadyn
76ed115e37 Porting TG's SQL 2021-01-25 23:37:49 -08:00
Razgriz
ea80be587b Merge pull request #750 from MisterGrimm/GoodbyeMicromechs 
Commenting out micro mech stuff
 2021-01-08 15:20:57 -07:00
Novacat
cabb515fae Merge pull request #9498 from VOREStation/upstream-merge-7787 
[MIRROR] Powered Exosuit Running Board (from /vg/station)
 2020-12-23 14:16:45 +00:00
Novacat
6127c5d2e9 Merge pull request #9455 from VOREStation/upstream-merge-7784 
[MIRROR] RPED QoL Tweak(s)/Unimplemented RPED Variant
 2020-12-14 03:05:22 +00:00
Novacat
a9f77823d7 Merge pull request #9333 from Tenryumi/nikki-fluff 
Adds Nikki's Fluff Outfit For Nikki, + Rigsuit-Mounted Size Guns For Research
 2020-11-30 23:46:15 +00:00
Chompstation Bot
db1c95c6a7 Move away from Travis CI to GitHub Actions 2020-11-24 19:00:16 +00:00
r4d6
e4f101a670 Uncomment Phase Weaponry 
Phase Weaponry can be printed again.
 2020-11-10 12:34:52 -05:00
Sym
1173ddf675 Remove micro mech stuff 
Time to take out the trash.
 2020-10-23 20:17:07 -04:00
r4d6
4413a6e444 Allow more types of Prosthetic to be made and torsos are no longer black. 2020-10-22 12:56:31 -04:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
ShadowLarkens
3d7b051f2b Convert /material to /datum/material 2020-09-27 16:16:44 -07:00
Nadyr
a615e822a2 updates scarab and phoron bore 2020-09-27 18:38:06 -04:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
SplinterGP
7bf3fc31bc Removes nanoUI autolathe code stuff. 2020-09-15 19:06:46 -03:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Cadyn
cffafc866c fix point control 2020-09-08 19:46:59 -07:00
Cadyn
99f8008072 Point defense control no longer named deluxe microwave 2020-09-08 08:03:26 -07:00
Darlantan
09768ea90c Confetti cannon 
-Adds confetti cannon
-Adds grenade object needed to make the cannon work
-Makes the cannon printable at RnD
 2020-09-05 07:15:49 -04:00
Novacat
dba5a14b5f Merge pull request #8952 from Heroman3003/constructible-vorelaws 
Constructible vorelaws
 2020-09-01 08:02:26 -04:00
Heroman3003
33f85fc4d6 Makes the vorelaw boards makeable 2020-09-01 16:34:24 +10:00
ShadowLarkens
20f1244c0c Whoops, don't make research levels global, we don't want permaautosync 2020-08-29 13:24:28 -07:00
ShadowLarkens
732b4a9530 Fix research console showing duplicates, make pages more clear 2020-08-29 12:49:45 -07:00
Rykka
898f6d9d0b Adds Destructive Analyzer Sounds to Destructive Analyzing 2020-08-28 14:14:48 -04:00
ShadowLarkens
097d4fa283 TGUI Research 2020-08-25 13:30:47 -07:00
izac112
48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
Mechoid
170b9a7513 FBP Internal Components 2020-08-20 21:40:15 -04:00
Novacat
8079ce2f0f Merge pull request #8720 from ShadowLarkens/tgui_cargo 
TGUI Cargo
 2020-08-18 09:48:13 -04:00
Mechoid
ccd5993b38 Exosuit Upkeep (#7473) 
* Exosuit upkeep, lower slowdown of Durand and Gygax components, guns now slow far less.

* Time time time.

* Seeds survive. For now.
 2020-08-17 18:19:51 -04:00
ShadowLarkens
aea68811f6 TGUI Request Console (and Fix TGUI verb) 2020-08-16 22:27:08 -07:00
izac112
5c02633707 Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-13 20:01:22 +02:00
LunarFleet
5e22710209 Take two 2020-08-13 09:54:11 -04:00
Atermonera
c4621602a3 Merge pull request #7441 from lbnesquik/Kot-MEchfab-staff 
Rename the shield drone to linear combat shield in mech fab.
 2020-08-12 14:19:44 -04:00
izac112
81871a960e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-10 21:50:42 +02:00
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull 
August2020UpstreamPull
 2020-08-09 02:58:18 -07:00
Novacat
be7206526a Merge pull request #8595 from lbnesquik/Kot-Janihound-tweak 
Add a belly size upgrade for hounds and fix an important typo.
 2020-08-08 16:30:46 -04:00
Mechoid
c20bab52d4 Exosuit Modular Internals, The Squeakening 2020-08-05 19:22:23 -04:00
lbnesquik
c01019c25e Add a belly size upgrade for hounds: 
- Researchable upgrade. It fits only hounds. It doubles the capacity of their sleeper for items. Usable only once. This does not affect number of patients.
 2020-08-05 14:53:24 +02:00
izac112
50834e4a7b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-02 23:52:01 +02:00
Novacat
de6f55a86d Update circuits.dm 2020-07-30 15:19:40 -04:00
Atermonera
31f04a4975 Aurora Cooking Port 2020-07-30 15:13:46 -04:00
izac112
38288b15c6 Voreupdate (small) 2020-07-27 06:34:28 +02:00
Cyantime
5eefadf78b Update netgun design name 2020-07-26 17:06:57 -04:00
izac112
601a155b30 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-25 15:22:42 +02:00
Rykka
c27b2d2234 Huge Bundle of Fixes, Update Cooking to current Aurora 
Cooking times are now no longer 10-15 minutes per item, the LARGEST items will take around ~4-5 minutes, 6 at the maximum in the case of the superbigbite (one of the most filling food items in the game).
Cooking oil tanks added
Appliances are now constructible instead of being eldritch black magic
Recipes are now reorganized to either fryer/oven/grill based on where they're made (Although recipes_microwave still needs a LOT more sorting)
Critical time bug with cooking fixed, AND you can now upgrade your appliances for even higher efficiencies!
 2020-07-22 22:14:04 -04:00
Rykka
886ab72289 Huge Bundle of Fixes, Update Cooking to current Aurora 
Cooking times are now no longer 10-15 minutes per item, the LARGEST items will take around ~4-5 minutes, 6 at the maximum in the case of the superbigbite (one of the most filling food items in the game).
Cooking oil tanks added
Appliances are now constructible instead of being eldritch black magic
Recipes are now reorganized to either fryer/oven/grill based on where they're made (Although recipes_microwave still needs a LOT more sorting)
Critical time bug with cooking fixed, AND you can now upgrade your appliances for even higher efficiencies!
 2020-07-22 21:34:13 -04:00