cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,149 Commits 6 Branches 0 Tags
f7e9f8d12bddd3183ee87a4e02ff9c5935b51a5c
Commit Graph

2856 Commits

Author SHA1 Message Date
Casey
764e792895 Remove the Exploration Department 2022-12-23 16:21:39 +00:00
Razgriz
ba4b775d6c Merge branch 'master' into upstream-merge-14206 2022-12-15 15:24:53 -07:00
Novacat
1e7cbec2e3 Missing href token adds 2022-12-15 20:43:47 +00:00
Novacat
607d70ca67 Merge pull request #14203 from Heroman3003/material-fixes 
Fixes autolathe thing.
 2022-12-15 20:43:41 +00:00
Casey
b461e2fd06 Ticket Printer! 2022-11-21 06:42:48 +00:00
Nadyr
223ffff44d powder that makes you say yes 2022-11-18 03:50:08 -05:00
Casey
dff8d7183a Shortwave Headsets Crate 2022-11-18 06:40:02 +00:00
Casey
5232e9cd2d Merge pull request #14009 from Heroman3003/material-runtime 
Fixes inserting sheets with no defined material (like tiles) into machines
 2022-10-30 15:26:17 +00:00
Nadyr
4157a6dc1b Merge pull request #5202 from CHOMPStation2/upstream-merge-14002 
[MIRROR] [MIRROR] Snowmobiles and Quadhancements V2
 2022-10-29 19:21:34 -04:00
Heroman3003
0010d61709 [MIRROR] Snowmobiles and Quadhancements V2 2022-10-29 07:40:19 +00:00
Heroman3003
4a38648ead Merge pull request #13974 from TheDavestDave/cargo-update 
lets cargo order a pair of great tits
 2022-10-29 07:38:10 +00:00
Casey
a452b89e36 Merge pull request #13943 from FunnyCatEnjoyer/FunnyCat2 
Adds the tactical AR visor.
 2022-10-23 18:53:11 +00:00
Nadyr
0773b248d8 Merge pull request #5121 from CHOMPStation2/upstream-merge-13884 
[MIRROR] Adds more sock variants
 2022-10-11 20:44:51 -04:00
Casey
2efa0bfcf0 Merge pull request #13884 from Cameron653/TRANS-SOCKS 
Adds more sock variants
 2022-10-10 03:09:50 +00:00
Casey
86ee514421 Merge pull request #13855 from Cameron653/overlay_madness 
Upgrades OverlaySS. Fixes #3627
 2022-10-10 03:02:27 +00:00
Razgriz
cd0e5fd00a Merge pull request #5068 from CHOMPStation2/upstream-merge-13828 
[MIRROR] Blueprint Revamp.
 2022-10-02 22:47:55 -07: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
Casey
892960d661 Blueprint Revamp. 2022-10-02 17:59:49 +00:00
Razgriz
dfb2ec2fb4 Revert "Revert "Vox security rigsuit"" 2022-09-23 00:00:48 -07:00
Razgriz
b1059fb2a4 Revert "Vox security rigsuit" 2022-09-22 22:27:09 -07:00
Razgriz
422c35eb8e Merge pull request #4852 from crabcube/master 
Vox security rigsuit
 2022-09-22 22:26:29 -07:00
Razgriz
ddb814a248 Merge pull request #5011 from CHOMPStation2/upstream-merge-12899 
[MIRROR] [MIRROR] Adds Sjorgen Inertial Shotgun (by H-H) (ABLE TO BE MERGED)
 2022-09-22 22:17:56 -07:00
Razgriz
64a7d9a36d Merge pull request #5010 from CHOMPStation2/upstream-merge-12971 
[MIRROR] [MIRROR] Bartending enhancements (ABLE TO BE MERGED)
 2022-09-22 22:17:43 -07:00
Razgriz
fa6ecc5cee Merge pull request #5004 from CHOMPStation2/upstream-merge-13467 
[MIRROR] [MIRROR] conk rete (ABLE TO BE MERGED)
 2022-09-22 22:10:59 -07:00
Razgriz
1e6801db96 Merge pull request #5016 from CHOMPStation2/upstream-merge-13460 
[MIRROR] [MIRROR] Antag Uplink Medical Adjustments (ABLE TO BE MERGED)
 2022-09-22 21:59:31 -07:00
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