cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-06 07:23:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
72,682 Commits 7 Branches 0 Tags
7429a71bcb7ef4f836bbe0aba08d37a8a3d517ef
Commit Graph

10480 Commits

Author SHA1 Message Date
Nadyr
7429a71bcb powder that makes you say yes 2023-01-04 20:12:26 -05:00
Heroman3003
c3d2148faa Maint pred cancel tweak 2022-12-29 04:51:39 +00:00
Heroman3003
6b5a73d2da Merge pull request #14257 from Heroman3003/varios-fixes 
Various minor fixes
 2022-12-28 05:02:08 +00:00
Novacat
f0b2c95957 Merge pull request #14256 from Heroman3003/borg-low-wall 
Two borg fixes
 2022-12-26 22:57:06 +00:00
Razgriz
e581589edf Merge pull request #5397 from CHOMPStation2/upstream-merge-14202 
[MIRROR] [MIRROR] Greenjoe12345/xmas2022
 2022-12-26 15:27:47 -07:00
Razgriz
bc832e34b9 Merge pull request #5445 from CHOMPStation2/upstream-merge-14238 
[MIRROR] Fixes a pair of runtimes
 2022-12-26 12:28:24 -07:00
Razgriz
14830c8729 Merge pull request #5443 from CHOMPStation2/upstream-merge-14235 
[MIRROR] Fixes critical inventory equipment bug
 2022-12-26 12:27:42 -07:00
Razgriz
af1fe8d2ab Merge pull request #5434 from CHOMPStation2/upstream-merge-14216 
[MIRROR] ticket printers and folders are now holsterable
 2022-12-26 12:20:43 -07:00
Razgriz
f1b3873f5e Merge pull request #5426 from Verkister/eggynames 
Adds custom egg name option for vorgan egg mode
 2022-12-26 12:17:46 -07:00
Casey
b1307d3896 Merge pull request #14238 from Heroman3003/langfix 
Fixes a pair of runtimes
 2022-12-24 08:35:07 +00:00
Casey
ece7dbb2f2 Merge pull request #14235 from Heroman3003/inventory-fix 
Fixes critical inventory equipment bug
 2022-12-24 06:25:59 +00:00
Casey
d21fd301a0 Merge pull request #14216 from TankTheBirb/holster-stuff 
ticket printers and folders are now holsterable
 2022-12-23 16:24:01 +00:00
BlackMajor
362f539e12 Chrimbus Tree 2022-12-23 20:40:37 +13:00
Verkister
3ff6d64011 Adds custom egg name option for vorgan egg mode 
Funnily enough I'm not adding this for some dirty disposals reasons this time. I just wanted to name my bottie's compact material packages something other than "rock egg" lmao
 2022-12-22 17:52:16 +02:00
Novacat
9f65f14549 Merge pull request #14209 from Heroman3003/runtimes-fixes-icons 
Some runtime fixes + oldchat icons
 2022-12-17 22:39:10 +00:00
Razgriz
120047e124 Port missing PR - [MIRROR]SSmachines optimizations (#5403) 
* Update Fire.dm

* Update machines.dm

* Update fuel.dm
 2022-12-15 21:49:31 -07:00
Nadyr
2cbe1726a1 Merge pull request #5401 from CHOMPStation2/upstream-merge-14206 
[MIRROR] Missing href token adds
 2022-12-15 22:45:45 -05:00
Novacat
1e7cbec2e3 Missing href token adds 2022-12-15 20:43:47 +00:00
Heroman3003
c502bad450 Merge pull request #14202 from VOREStation/upstream-merge-8859 
[MIRROR] Greenjoe12345/xmas2022
 2022-12-14 06:36:11 +00:00
Heroman3003
b2a1fbeecd Merge pull request #14198 from VOREStation/upstream-merge-8853 
[MIRROR] Fixes shards having unlimited afterattack range
 2022-12-13 22:08:55 +00:00
Razgriz
f2338a49a2 Merge pull request #5290 from CHOMPStation2/upstream-merge-14096 
[MIRROR] Trash pile adjustments
 2022-12-11 19:48:58 -07:00
Razgriz
034e6bd7b3 powder that rejects your reality and substitutes our own 2022-12-11 19:17:42 -07:00
TheGreatKitsune
c4ca4bbaed Merge master into reforming. 2022-12-10 14:53:38 -06:00
TheGreatKitsune
926f7d1e63 Fix remaining reforming bugs 2022-12-10 14:49:30 -06:00
Nadyr
20fdc12788 Merge pull request #5335 from CHOMPStation2/upstream-merge-14164 
[MIRROR] [MIRROR] Cleanable robo remains
 2022-12-03 21:15:02 -05:00
Heroman3003
11ee3ee08e Merge pull request #14164 from VOREStation/upstream-merge-8852 
[MIRROR] Cleanable robo remains
 2022-12-03 20:12:44 +00:00
Nadyr
0b5c3ff9e1 Merge branch 'master' into upstream-merge-14148 2022-12-02 20:46:08 -05:00
Nadyr
81a125bc95 Merge pull request #5321 from CHOMPStation2/upstream-merge-14136 
[MIRROR] Adds more altevian things
 2022-12-02 20:37:51 -05:00
Casey
47d8000b2d Further Hacktool Adjustments 2022-11-27 18:02:23 +00:00
Casey
10e697c6fe Merge pull request #14136 from Heroman3003/altevian-thanksgiving 
Adds more altevian things
 2022-11-26 22:41:43 +00:00
Casey
7c84514c61 Merge pull request #14137 from KillianKirilenko/kk-hacktool 
Simplified Hacktool
 2022-11-26 22:41:34 +00:00
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
Heroman3003
2e7c58bfa8 Merge pull request #14096 from Novacat/nova-basicfixes 
Trash pile adjustments
 2022-11-21 04:34:16 +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