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
71,766 Commits 6 Branches 0 Tags
897c1135fa9ea226720f8c54166566b54c5eabd1
Commit Graph

1274 Commits

Author SHA1 Message Date
Casey
897c1135fa Merge pull request #13883 from Heroman3003/assorted-fix 
Allows ID to be inserted into fax machine by clicking it + 2 minor fixes
 2022-10-10 03:08:35 +00:00
Razgriz
2b204b9194 Port old point defense stuff I rage-closed 
Tech-debt repo-man called
https://github.com/CHOMPStation2/CHOMPStation2/pull/1790
 2022-10-02 21:39:21 -07:00
Desert
5534566f08 Adds the other drone assemblies to the protolathe FIXES #3893 2022-09-20 21:05:49 -05:00
Nadyr
f0b51aba36 powder that makes you say yes 2022-08-17 17:45:16 -04:00
Casey
f47a993e01 Makes the reverse-mouseray able to be made via research. 2022-08-17 20:10:17 +00:00
LordSaladin
bdfb0776ac Creates modular files for autolathe arms and protofab weapons 
replaces the existing weapons_ch file for the protofab designs with a modular one along with creating a modular arms file for the autolathe, in addition  this makes the caseless rifle and it's magazines printable the former via the protofab and the latter via the autolathe.(I've set the rifle so it requires at least 5 levels in material, combat and phoron so that buying the crate from cargo is still viable when there's no sci or mining.)
 2022-07-21 17:39:35 +01:00
Casey
48f835f41f Fixes in-chat icons being broken in oldchat 2022-07-20 17:24:27 +00:00
Casey
285b424a75 Death of pAIs!!! 2022-06-29 05:58:53 +00:00
Razgriz
7a1b5a2660 Merge pull request #4264 from CHOMPStation2/power-cell-restoration 
Restore power cell sprite to "V2" and add cells to protolathe
 2022-05-18 14:51:27 -07:00
Razgriz
7e26f9d1a1 Restore power cell sprite to "V2" and add cells to protolathe 
-Restored power cell sprites to the "V2" sprites as I called them.
-Disabled base and virgo power cell/device/power_cell_research files and moved them into chomp modularity folder instead.

Added to the protolathe (I hope because I forgot to last time):
-Giga device cells
-Giga large cells
-Rechargeable weapon cell
-EMP-proof device cell
-EMP-proof weapon device cell
-Potato device cell


All the giga and recharging cells will require precursor tech 1.
 2022-05-18 00:28:31 -07:00
Casey
61fce152d5 Merge pull request #12974 from foopwo/borgotoys 
Adds a couple of new toys for cyborgs.
 2022-05-15 20:15:29 +00:00
Casey
fd5a1d7ce2 Merge pull request #12820 from Heroman3003/slow_sizegun 
Adds gradual sizegun
 2022-04-24 07:16:37 +00:00
Nadyr
d47d752066 powder that makes you say yes 2022-04-18 22:32:55 -04:00
Casey
cd9e4ab745 re-EnerGen Batteries 2022-04-18 20:48:14 +00:00
Casey
0a447ad26f Merge pull request #12698 from FartMaster69420/xenobio-upgrades-clean 
Xenobio Upgrades
 2022-04-11 19:24:32 +00:00
Razgriz
0c60cfeede Revert graviton visor nerf 2022-04-10 13:27:40 -07:00
Casey
3f3a075f97 Merge pull request #12687 from Heroman3003/nerfnd 
Nerfs gravitons and morphium, adds lots of boards into autolathe
 2022-04-09 04:21:25 +00:00
Nadyr
6fe5e8c1e1 Merge pull request #3991 from CHOMPStation2/upstream-merge-12579 
[MIRROR] The Grand /TG Port - Part 5
 2022-04-04 17:37:57 -04:00
Casey
3add9b1880 The Grand /TG Port - Part 1 2022-04-04 16:50:53 -04:00
Casey
60b1eeff99 Merge pull request #12579 from GhostActual/tg-port-5 
The Grand /TG Port - Part 5
 2022-04-03 03:30:56 +00:00
Casey
dc618675c1 Shotguns and Bolt-Action Rifles 2022-03-21 09:54:13 +00:00
Razgriz
d80abb7ec2 powder that makes you say yes 2022-03-18 18:46:26 -07:00
Casey
c0231159bc Adding Mining AOE PKA Upgrade to the Protolathe 2022-03-15 00:00:33 +00:00
Casey
765f4cd2b3 More Upgrade Modules for Borgs 2022-03-12 20:44:57 +00:00
Razgriz
c09ad1baa9 powder that makes you say yes and hate the map changes 2022-03-04 15:23:33 -07:00
Casey
80f5298a18 Ammo Boxes 2022-03-03 21:23:43 +00:00
Cyrelius
baba26d565 Merge branch 'CHOMPStation2:master' into master 2022-02-08 23:29:16 -08:00
Cyrelius
7a30bfb9d5 Update mechfab_designs_ch.dm 
Missed a line break.  un-missed.
 2022-02-08 23:28:06 -08:00
Cyrelius
aa6821e8a1 Update mechfab_designs_ch.dm 
Fix minor spelling mistake.
 2022-02-08 23:27:14 -08:00
Cyrelius
79182736ed Update circuits_ch.dm 
Add Phazon circuits to the circuit imprinter.
 2022-02-08 23:26:10 -08:00
Nadyr
77f4e9fb63 Merge pull request #3627 from CHOMPStation2/upstream-merge-12144 
[MIRROR] exosuit cargo expansion equipment
 2022-02-06 21:51:00 -05:00
Casey
1eabc49fc5 Merge pull request #12144 from Hatterhat/special-compartment 
exosuit cargo expansion equipment
 2022-02-06 23:23:09 +00:00
Cyrelius
74cf803b31 Update mechfab_designs_ch.dm 
Fix minor mistake.
 2022-02-04 23:51:45 -08:00
Cyrelius
f8a96a807f Update mechfab_designs_ch.dm 
Adds the Phazon to the Exosuit fabricator's crafting menu with what I think are appropriate costs.
 2022-02-03 21:31:15 -08:00
Cyrelius
1d06f2ff55 Update mechfab_designs.dm 
Re-enabled the shields that Virgo disabled, though I did make them a bit higher on the tech list, and added verdantium to their cost.
 2022-02-03 20:57:01 -08:00
Casey
9930be53e8 Merge pull request #12012 from Hatterhat/rad-apes-real 
rad apes real
 2022-01-09 01:52:38 +00:00
Casey
e773ca01c9 Merge pull request #11832 from Hatterhat/pad-booster 
mechaport gaming
 2021-12-10 02:51:14 +00:00
Nadyr
d1a3c9057b Merge pull request #3237 from CHOMPStation2/upstream-merge-11905 
[MIRROR] Makes stomach organs printable in bioprinter and prosfab
 2021-12-05 12:07:07 -05:00
Nadyr
358dfd3f99 powder that makes you say yes 2021-12-05 11:54:45 -05:00
Nadyr
1406500432 powder that makes you say yes 2021-12-05 11:51:30 -05:00
Chompstation Bot
3caad465fa the part printing buff nobody asked for 2021-10-27 21:05:26 -04:00
Chompstation Bot
536a6cb6e7 [WIP] Atmospheric Retention Fields 2021-10-27 18:39:20 +00:00
Casey
38f2a0b96a Merge pull request #11562 from PastelPrinceDan/belts 
Medical and utility belts of holding
 2021-09-24 03:47:47 +00:00
Nadyr
a2fdccce5e powder that makes you say yes 2021-08-26 21:05:44 -04:00
Nadyr
d1efe83113 Merge branch 'master' into upstream-merge-11508 2021-08-26 21:00:44 -04:00
Nadyr
e2838d7cfe Merge pull request #2902 from CHOMPStationBot/upstream-merge-11494 
[MIRROR] [MIRROR] Illegal Tech -> Transgressive Tech
 2021-08-26 20:43:11 -04:00
Chompstation Bot
4cd79beb29 Fix annoying runtime with exosuit fab 2021-08-27 00:11:54 +00:00
Aronai Sieyes
49696b2029 Merge pull request #11494 from VOREStation/upstream-merge-8243 
[MIRROR] Illegal Tech -> Transgressive Tech
 2021-08-26 16:54:17 +00:00
Chompstation Bot
af0d7a0f6b Make stack amount var private 2021-08-26 15:39:04 +00:00
Nadyr
f19dc1b2eb Merge pull request #2874 from cadyn/upstream-merge-11421 
Merge Upstream Pull Request 11421
 2021-08-25 22:38:53 -04:00