cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,499 Commits 5 Branches 0 Tags
ed79946ade0b901b30e7c57b0c429a0db86bf16f
Commit Graph

2881 Commits

Author SHA1 Message Date
Razgriz
96bdd8293f powder that makes you say yes 2022-09-22 21:54:03 -07:00
Razgriz
e9fd1fc7da powder that makes you say yes 2022-09-22 21:52:54 -07:00
Razgriz
e17fa4e235 powder that makes you say yes 2022-09-22 21:44:23 -07:00
Razgriz
626bfcca83 Merge pull request #5005 from CHOMPStation2/upstream-merge-13509 
[MIRROR] [MIRROR] Uplink Armor Point Adjustments (ABLE TO BE MERGED)
 2022-09-22 21:39:00 -07:00
VirgoBot
7c12d5d4fe [MIRROR] Antag Uplink Medical Adjustments (ABLE TO BE MERGED) (#13460) 
* Antag Uplink Medical Adjustments

* Update medical.dm

* Update medical.dm

Co-authored-by: Atermonera <atermonera@gmail.com>
Co-authored-by: C.L <killer65311@gmail.com>
 2022-09-23 01:23:17 +00:00
VirgoBot
4c6658f35e [MIRROR] Uplink Armor Point Adjustments (ABLE TO BE MERGED) (#13509) 
* Uplink Armor Point Adjustments

* Update armor.dm

Co-authored-by: Atermonera <atermonera@gmail.com>
Co-authored-by: C.L <killer65311@gmail.com>
 2022-09-23 01:03:54 +00:00
VirgoBot
4acf5e2e67 [MIRROR] conk rete (ABLE TO BE MERGED) 2022-09-23 01:03:49 +00:00
Casey
efef3da1af Merge pull request #13771 from Heroman3003/hotfood-nerf 
Removes hotfood vendors from station spawning
 2022-09-23 00:56:17 +00:00
crabcube
c61c73d844 Update voidsuits.dm 
Brain was off and did a voxcurity, it is no more
 2022-09-11 01:58:21 -05:00
Verkister
21417259ea Enables cargo otie crates 
Also adds a few more rng types for the said crates.
Unmarked earlyport for now i guess
 2022-09-06 16:30:44 +03:00
crabcube
ec651f3512 Fixes bad path 
Shoutout to the great kitsune
 2022-09-05 13:56:57 -05:00
crabcube
0b10e7f38a Update voidsuits.dm 2022-09-05 13:45:10 -05:00
crabcube
3600bce509 Adds Vox Security rig to cargo 
Exactly as it says on the tin
 2022-09-05 13:31:06 -05:00
Casey
6d970b9e9c Bugfix Palooza 2022-09-04 21:51:29 +00:00
Victor Zisthus
eda6b96d29 Comment 2022-08-30 02:53:12 -04:00
Victor Zisthus
f18662cb44 Fixes Captain's ID card 
Mechanically, no change.

But now cap has their drip back.

Before this PR on the left, after on the right.
 2022-08-30 01:07:00 -04:00
Nadyr
d46d8dc33c Merge pull request #4782 from CHOMPStation2/upstream-merge-13570 
[MIRROR] Adds Altevian cuisine
 2022-08-28 19:26:06 -04:00
Nadyr
b6c5db3b46 Merge pull request #4770 from CHOMPStation2/upstream-merge-13566 
[MIRROR] [MIRROR] Adjustments to Uplink Tools cost
 2022-08-28 19:09:30 -04:00
Nadyr
9a48b22a51 Merge pull request #4748 from CHOMPStation2/upstream-merge-13535 
[MIRROR] Increases bluespace interferance
 2022-08-28 19:08:15 -04:00
Nadyr
35288a7cdb powder that makes you say yes 2022-08-28 18:41:33 -04:00
Casey
85cf31f79c Merge pull request #13570 from Heroman3003/altevian-foods 
Adds Altevian cuisine
 2022-08-25 23:00:13 +00:00
Novacat
42987ca089 Merge pull request #13566 from VOREStation/upstream-merge-8686 
[MIRROR] Adjustments to Uplink Tools cost
 2022-08-23 22:29:04 +00:00
Casey
e3d3693a97 Increases bluespace interferance 2022-08-21 19:38:46 +00:00
crabcube
f9cfe780af Fixes the syntax even more, i'm so good at coding 2022-08-01 23:19:49 -05:00
crabcube
336b2bdb76 fixes more of my bad syntax 2022-08-01 23:10:23 -05:00
crabcube
23d60f1378 Adds Vox Engineering hardsuit to cargo 
Makes the thingy I just made actually obtainable.
 2022-07-26 23:49:39 -05:00
Casey
48f835f41f Fixes in-chat icons being broken in oldchat 2022-07-20 17:24:27 +00:00
Casey
b66a47e086 Input Patches 2022-06-29 06:01:21 +00:00
Casey
68c3469d60 ALL runtimes 2022-06-23 09:41:56 +00:00
Nadyr
531bb77df2 powder that makes you say yes 2022-06-22 23:56:48 -04:00
Nadyr
39e426b4c6 powder that makes you say yes 2022-06-22 23:56:05 -04:00
Casey
5788a26593 Input Fixes 2022-06-22 23:54:36 -04:00
Nadyr
a2d9c8b58a Merge branch 'master' into upstream-merge-13122 2022-06-22 22:37:44 -04:00
Nadyr
1b30469c6b Merge pull request #4383 from CHOMPStation2/upstream-merge-13114 
[MIRROR] Adds Happy carpet
 2022-06-22 22:33:37 -04:00
Nadyr
e81e1f4faf Merge branch 'master' into upstream-merge-13112 2022-06-22 21:58:12 -04:00
Nadyr
46ff42c250 Merge pull request #4371 from CHOMPStation2/upstream-merge-13103 
[MIRROR] [MIRROR-FIX] Cooking QOL V2
 2022-06-22 21:55:19 -04:00
Nadyr
5b75024c2f Merge branch 'master' into upstream-merge-13114 2022-06-22 21:47:19 -04:00
Casey
b0802ce267 More TGUI Input Conversions 2022-06-19 11:09:42 +00:00
Casey
928a321b5f TGUI Input Conversions 2022-06-19 03:59:14 +00:00
Casey
d4f8e75cd6 Adds Happy carpet 2022-06-19 03:59:10 +00:00
Casey
54279fa4de [MIRROR] Adds Some More Decorative Flooring Types 2022-06-19 00:44:42 +00:00
Novacat
47c92f2581 [MIRROR-FIX] Cooking QOL V2 2022-06-18 14:45:56 +00:00
Casey
f958518ea9 Merge pull request #13035 from lm40/nogods 
localizes religion and adds custom chaplain titles
 2022-06-04 16:38:53 +00:00
Casey
0b78f2647c Merge pull request #12953 from FartMaster69420/sleevecard-pai 
Sleevecard simplification and features
 2022-05-22 18:17:28 +00:00
Razgriz
e37400e1ac Merge pull request #3064 from Rykka-Stormheart/shep-dev-ambience-3.0 
Update Ambient Sounds 3.0
 2022-05-18 21:42:59 -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
Razgriz
d7c6d66332 Merge branch 'master' into Cargo-crate-stuff 2022-05-14 14:41:35 -07:00
Novacat
4b4ba32e03 Merge pull request #12968 from Heroman3003/RUNTIME-FIX-END-ME 
Fixes runtimes being broken. Removes back-worn watertanks. NO I DO NO…
 2022-05-14 13:05:43 +00:00
LordSaladin
dd9b12a279 git should see it now 2022-05-05 18:42:43 +01:00
LordSaladin
9c853318d5 Create medical_ch.dm 2022-05-05 18:41:56 +01:00