cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
81,621 Commits 5 Branches 0 Tags
ac77b94d4b4dc41e6fa757ee5d0dce908b525844
Commit Graph

147 Commits

Author SHA1 Message Date
CHOMPStation2StaffMirrorBot
3cfc33bfde [MIRROR] ports a bunch of grep checks from TG (#10361) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2025-03-12 11:09:38 +01:00
CHOMPStation2StaffMirrorBot
65f21fb1d3 [MIRROR] end of file Fix (#10355) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-03-11 17:58:14 +01:00
tacoguy7765093
d0ebe164ac [READY] The not so great but pretty alright ammo simplifcation (#9831) 2025-01-15 14:28:18 +01:00
CHOMPStation2StaffMirrorBot
f7e9f8d12b [MIRROR] Ring/Watch Accessory Transfer (#9489) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-11-19 19:14:32 +01:00
CHOMPStation2
5ea698a0ef [MIRROR] Removes /obj/item/weapon and /obj/item/device [MDB IGNORE] (#9084) 
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-09-30 21:36:41 +02:00
tacoguy7765093
99830636d9 [READY] Walks back combat refactor, plus ammo balance changes (#8728) 2024-08-13 18:11:04 -04:00
Cadyn
abc16a2e2a The big ammo simplification (#8171) 2024-06-25 13:57:20 +02:00
Etheo
95e32dd323 Bodycams :) (#7573) 2024-01-22 07:50:04 +01:00
Heroman3003
e62d81af4b [MIRROR] the little construction pr 2023-07-07 07:30:36 +00:00
Casey
0b78f2647c Merge pull request #12953 from FartMaster69420/sleevecard-pai 
Sleevecard simplification and features
 2022-05-22 18:17:28 +00: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
Raeschen
2ff4088bd3 Adds a light painter device, adds to Autolathe. 
Creates a Light Painter device.
Use the device to assign a color. Use again to reset to default color. Click on any light fixture to apply.

Simple.
 2022-04-04 23:45:55 +02:00
Casey
80f5298a18 Ammo Boxes 2022-03-03 21:23:43 +00:00
Casey
b60ad04452 Merge pull request #12016 from PastelPrinceDan/injectorslargo 
makes large autoinjectors cheaper
 2022-01-09 01:52:14 +00:00
Psik9941
7c03ffc35c Adding //CHOMPEdit comment 
Noted
 2021-10-11 09:09:42 -05:00
Psik9941
730024d25c Update tools.dm 
Adding cable coil to autolathe under the tools category
Default additions just have 1x, 5x, 10x print options.
Looking into a 30x print option to get a max stack, but need to dig through more code to figure out how this is done.
 2021-10-11 08:51:27 -05:00
Casey
35d62f6ea7 Merge pull request #11582 from PastelPrinceDan/autoinjectors 
Adds large autoinjectors to autolathes
 2021-09-24 03:55:25 +00:00
Aronai Sieyes
8faa3a57ce Merge pull request #11050 from VOREStation/Arokha/rsf 
Add RSF to autolathes
 2021-07-12 23:47:42 +00:00
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Chompstation Bot
a94e471add Material Container Component & Autolathe QoL 2021-06-13 03:18:30 +00:00
Chompstation Bot
2b3041e7b6 [MIRROR] Wall-mounted Geiger Counters 2021-05-23 22:27:56 +00:00
Razgriz
a721affb95 Fix comment spelling 
I don't give a shit if it's a comment. You don't just edit a comment for no reason just to misspell "duplication" as "duplaction". I'm putting that back to normal. My OCD demands it.
 2021-04-10 22:20:55 -07:00
Novacat
aa8abda597 Merge pull request #10117 from VOREStation/upstream-merge-8019 
[MIRROR] Autolathes don't spam debug on first use
 2021-04-10 12:36:45 +00:00
Chompstation Bot
588179bd66 Remove unnecessary 'signatures' 2021-04-08 16:48:30 +00:00
Chompstation Bot
b85e9fc4d9 [MIRROR] Industrial Expansion 2021-03-09 21:53:03 +00:00
Chompstation Bot
247bcbcc24 Adds a bunch more boards to technical storage and AI law storage, makes appliance boards makeable in autolathe 2021-03-06 23:21:40 +00:00
Novacat
5211edc9c0 Merge pull request #9573 from VOREStation/upstream-merge-7786 
[MIRROR] Gadgets & Gizmos
 2021-01-24 06:55:05 +00:00
SplinterGP
7bf3fc31bc Removes nanoUI autolathe code stuff. 2020-09-15 19:06:46 -03:00
izac112
9d8f2623de More thingus 2020-09-14 14:09:52 +02:00
izac112
b4615a306a reverts to old lathe and fixes one of the build errors related to it 2020-09-14 13:37:03 +02:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02: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
Novacat
c314578ed3 Merge pull request #8786 from Meghan-Rossi/lathefix 
Fixes duplicate autolathe entries+lets you batch-print carafes+pitchers
 2020-08-21 17:16:44 -04:00
Verkister
929ce6c728 Merge branch 'master' into upstream-merge-7386 2020-08-21 14:12:26 +03:00
Meghan-Rossi
470d76db4b Fixes duplicate autolathe entries+lets you batch-print carafes+pitchers 
*Removes some autolathe entries made redundant by https://github.com/VOREStation/VOREStation/pull/8784
*Makes glass carafes and plastic pitchers batch-printable
 2020-08-21 07:58:44 +01:00
Atermonera
4a6d87c3a5 Merge pull request #7521 from Meghan-Rossi/metapint 
Adds metamorphic pint glasses to RSF, autolathe, supply packs
 2020-08-21 01:28:23 -04:00
Mechoid
496322f4f1 Reagent Hoses 2020-08-20 21:24:06 -04:00
Rykka
e9ed73f6b5 Makes Pint Metaglasses Printable 
TL;DR Only Virgo and downstreams can print metaglasses, but we never added printing for the pint version.
 2020-08-19 16:52:41 -04: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
Atermonera
6c3273bd20 Merge pull request #7444 from Mechoid/FixAutolatheForging 
Removes the ability to forge plasteel from steel.
 2020-08-12 14:21:01 -04:00
izac112
81871a960e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-10 21:50:42 +02:00
Novacat
088f634374 Update general.dm 2020-08-05 21:13:30 -04:00
Novacat
40c08685d2 Update general.dm 2020-08-05 19:35:33 -04:00
Mechoid
c20bab52d4 Exosuit Modular Internals, The Squeakening 2020-08-05 19:22:23 -04:00
izac112
50834e4a7b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-02 23:52:01 +02:00
Mechoid
78b51c58b4 Fish tank 2020-08-01 23:46:08 -04:00
izac112
390441705b unit tests 2020-07-25 15:52:25 +02:00
SplinterGP
7a2de0520d Weapons changes 2020-07-20 22:12:01 -03:00
SplinterGP
2424a9f6d7 More autolathe fixes and icon stuff 2020-06-23 22:01:48 -03:00