cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
63,325 Commits 10 Branches 0 Tags
1f33d5696f8432e41bd7a62da705f00a4b801ddf
Commit Graph

1186 Commits

Author SHA1 Message Date
Razgriz
962992d171 Added safety lock feature to phaseguns, same as frontier phaser 
Added safety lock feature to phaseguns, same as frontier phaser
 2021-03-31 01:35:35 -07:00
Chompstation Bot
b7b8682e7c [MIRROR] Added think-tanks. 2021-03-18 14:57:26 +00:00
Razgriz
6e171d3182 Merge pull request #1536 from CHOMPStationBot/upstream-merge-9396 
[MIRROR] [MIRROR] Matter Matters
 2021-03-16 22:22:28 -07:00
Nadyr
57b6444745 Merge pull request #1568 from CHOMPStationBot/upstream-merge-9904 
[MIRROR] Updates the _vr recipies to include copper
 2021-03-12 01:10:27 -05:00
Nadyr
3a7013855f Update medical_vr.dm 2021-03-12 00:45:57 -05:00
Nadyr
62e293b890 Merge pull request #1557 from CHOMPStationBot/upstream-merge-9894 
[MIRROR] [MIRROR] Adds an advanced version of the mining drill scanner.
 2021-03-12 00:05:38 -05:00
Nadyr
cd3aecf006 Update mining_toys.dm 2021-03-11 23:49:45 -05:00
Chompstation Bot
d2e828454f Updates the _vr recipies to include copper 2021-03-10 20:46:03 +00:00
Novacat
b6d583cbab Merge pull request #9895 from Novacat/nova-basicfixes 
Fixes Industrial Expansion
 2021-03-10 19:27:55 +00:00
Chompstation Bot
4c8dab8a21 [MIRROR] Adds an advanced version of the mining drill scanner. 2021-03-10 19:17:39 +00:00
Nadyr
d3dd243d72 Update mechfab_designs.dm 2021-03-10 00:54:22 -05:00
Nadyr
d04c4f7b73 Update weapons.dm 2021-03-10 00:51:39 -05:00
Nadyr
c4a5f1a238 Update power_cells.dm 2021-03-10 00:41:59 -05:00
Chompstation Bot
b85e9fc4d9 [MIRROR] Industrial Expansion 2021-03-09 21:53:03 +00:00
Chompstation Bot
9270659dbb [MIRROR] Matter Matters 2021-03-09 20:42:39 +00:00
Novacat
ebf0391948 Merge pull request #9865 from Heroman3003/sizespace-suit 
Adds HYPER suit
 2021-03-08 16:06:23 +00:00
Test Turtle
5ff44857e0 satchel of holding added 2021-03-06 17:34:10 -08:00
Nadyr
c73797662f Update engineering.dm 2021-02-14 07:16:39 -05:00
Chompstation Bot
6f2b456c79 Add Rapid Pipe Dispenser to R&D 2021-02-11 13:28:31 +00:00
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