cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-27 09:42:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
72,351 Commits 8 Branches 0 Tags
06f8f00a1fd1eede81f5d3fb372f3808b7f249de
Commit Graph

10448 Commits

Author SHA1 Message Date
Nadyr
71faa610e0 Merge pull request #5300 from CHOMPStation2/upstream-merge-14133 
[MIRROR] Ticket printer in belt
 2022-11-21 23:44:27 -05:00
Casey
82951868f6 Merge pull request #14133 from Very-Soft/SecurityTickettweak 
Ticket printer in belt
 2022-11-22 01:56:07 +00:00
Casey
b461e2fd06 Ticket Printer! 2022-11-21 06:42:48 +00:00
Casey
191657472b Merge pull request #14066 from Heroman3003/sofix 
Hopefully fixes corner sofas
 2022-11-13 20:47:59 +00:00
Nadyr
d916627637 Merge pull request #5238 from CHOMPStation2/upstream-merge-14048 
[MIRROR] Fix bump teleporter
 2022-11-07 17:35:58 -05:00
Casey
9922942a73 Merge pull request #14048 from Very-Soft/fixbumptele 
Fix bump teleporter
 2022-11-06 21:49:52 +00:00
Casey
18e8135f8e Merge pull request #14033 from Heroman3003/axe-the-axe 
Axes the axes
 2022-11-06 17:12:35 +00:00
Verkister
3eb0e7a6e8 Adds updated OOC link into the recipe book 
Might as well put that thing in the kitchen into some kind of relevant use.
 2022-10-30 17:09:15 +02:00
Nadyr
d77e4f84cb Merge pull request #3877 from TheGreatKitsune/non-crew-role 
Non crew role added
 2022-10-29 19:08:16 -04:00
Nadyr
f9c63a2c86 Merge pull request #5203 from CHOMPStation2/upstream-merge-13999 
[MIRROR] [MIRROR] Adds flasks to the forensic belt allowed items
 2022-10-29 19:07:17 -04:00
Heroman3003
2b434705c9 Merge pull request #13999 from VOREStation/upstream-merge-8799 
[MIRROR] Adds flasks to the forensic belt allowed items
 2022-10-29 07:41:25 +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
189f0dd88a Merge pull request #13941 from BonniePandora/Belts-&-Bindings-excite-me 
CE & Detective belts tweak
 2022-10-23 18:50:58 +00:00
Nadyr
60c6d78cca Merge pull request #5152 from CHOMPStation2/upstream-merge-13924 
[MIRROR] [MIRROR] speculative fix for obj/random's not being deleted
 2022-10-19 17:15:39 -04:00
Nadyr
bc7ece8d95 Merge pull request #5147 from CHOMPStation2/upstream-merge-13916 
[MIRROR] [MIRROR] Fixes overlooked invisible spawner when mapping
 2022-10-19 17:13:24 -04:00
Nadyr
ed42e3349a Merge pull request #5139 from CHOMPStation2/upstream-merge-13895 
[MIRROR] Random-Soap Addon
 2022-10-19 17:10:37 -04:00
Casey
f5a847464c Merge pull request #13924 from VOREStation/upstream-merge-8752 
[MIRROR] speculative fix for obj/random's not being deleted
 2022-10-16 21:10:01 +00:00
Casey
aaef0c5556 Merge pull request #13916 from VOREStation/upstream-merge-8751 
[MIRROR] Fixes overlooked invisible spawner when mapping
 2022-10-16 21:07:35 +00:00
Casey
1d3e58a5a9 Merge pull request #13895 from KillianKirilenko/kk-randomsoap 
Random-Soap Addon
 2022-10-16 21:02:50 +00:00
Casey
bd67968cb8 talon, vb, and typhon fixes 2022-10-16 21:02:45 +00:00
Razgriz
81da61dd70 Merge pull request #5134 from CHOMPStation2/BlackMajor-patch-2 
Fixes some small transit bug.
 2022-10-15 23:13:16 -07:00
BlackMajor
24c64ae0a6 Fixes 2022-10-16 11:33:57 +13:00
Nadyr
7df5e6e4cb Merge pull request #5113 from CHOMPStation2/upstream-merge-13867 
[MIRROR] [MIRROR] A -ton of Flags [READY FOR MERGE]
 2022-10-11 20:43:55 -04:00
Nadyr
dc0115955a Merge pull request #5117 from CHOMPStation2/upstream-merge-13868 
[MIRROR] [MIRROR] Rub A Dub Dub [READY FOR MERGE]
 2022-10-11 20:37:18 -04:00
Nadyr
2b8950a437 Merge pull request #5108 from CHOMPStation2/upstream-merge-13859 
[MIRROR] ALL TERRAIN WINGS
 2022-10-11 20:34:22 -04:00
Nadyr
ee931af484 Merge pull request #5099 from CHOMPStation2/upstream-merge-13848 
[MIRROR] Medical tweaks and Medical Malpractice
 2022-10-11 20:19:25 -04:00
Nadyr
39b30a4196 powder that makes you say yes 2022-10-11 20:18:53 -04:00
Nadyr
909b272a65 Merge pull request #5105 from CHOMPStation2/upstream-merge-13855 
[MIRROR] Upgrades OverlaySS. Fixes #3627
 2022-10-11 20:11:40 -04:00
Nadyr
b7582d85b5 Merge pull request #5100 from CHOMPStation2/upstream-merge-13846 
[MIRROR] we don't need to see your hate speech
 2022-10-11 20:05:28 -04:00
Casey
557371a7f5 Merge pull request #13868 from VOREStation/upstream-merge-8726 
[MIRROR] Rub A Dub Dub [READY FOR MERGE]
 2022-10-10 03:07:29 +00:00
Casey
b1e9486aab [MIRROR] A -ton of Flags [READY FOR MERGE] 2022-10-10 03:06:09 +00:00
Casey
9665bac0b5 Merge pull request #13859 from Cameron653/FLYING 
ALL TERRAIN WINGS
 2022-10-10 03:03:42 +00:00
Casey
86ee514421 Merge pull request #13855 from Cameron653/overlay_madness 
Upgrades OverlaySS. Fixes #3627
 2022-10-10 03:02:27 +00:00
Casey
032e01118b Merge pull request #13846 from VOREStation/aggressive-graffiti 
we don't need to see your hate speech
 2022-10-10 02:58:57 +00:00
Casey
76280d914e Medical tweaks and Medical Malpractice 2022-10-10 02:58:53 +00:00
Casey
7a4a02a0fd Smole vending tweak 2022-10-10 02:56:29 +00:00
Razgriz
bc11a71651 Merge pull request #5065 from CHOMPStation2/upstream-merge-13825 
[MIRROR] Sanitization
 2022-10-02 23:01:42 -07:00
Razgriz
cd0e5fd00a Merge pull request #5068 from CHOMPStation2/upstream-merge-13828 
[MIRROR] Blueprint Revamp.
 2022-10-02 22:47:55 -07:00
Razgriz
d0185f2ce3 Merge pull request #5067 from CHOMPStation2/upstream-merge-13823 
[MIRROR] Adds in 'compliance implant'
 2022-10-02 22:24:18 -07:00
Razgriz
6c1509c0ad powder that makes you say yes 2022-10-02 22:03:08 -07:00
Razgriz
6a40e6518d Merge branch 'master' into upstream-merge-13825 2022-10-02 22:00:46 -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
Casey
f6708d3687 Adds in 'compliance implant' 2022-10-02 17:58:42 +00:00
Casey
d8b03336e5 Sanitization 2022-10-02 17:58:34 +00:00
Casey
e89b36dfc9 Merge pull request #13812 from Cameron653/PSG-HOTFIX 
Fixes inability to use multitool on upgraded shields
 2022-10-02 17:53:59 +00:00
Nadyr
16cdb0dd2f Merge pull request #5046 from CHOMPStation2/upstream-merge-13804 
[MIRROR] ADMIN: EVENT
 2022-09-25 17:50:54 -04:00
Nadyr
c3374cff9f powder that makes you say yes 2022-09-25 17:19:38 -04:00
C.L
dacb52516e Merge pull request #13804 from Heroman3003/empty-message-fix 
ADMIN: EVENT
 2022-09-25 20:48:53 +00:00
Casey
1550c3bee5 Mining adjustments 2022-09-25 20:47:34 +00:00