cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
77,916 Commits 8 Branches 0 Tags
0914aad76576b6a6be5626455be13f73b0449b51
Commit Graph

1745 Commits

Author SHA1 Message Date
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Chompstation Bot
ad122fdd96 Rewrite RCON UI 2021-06-25 21:53:58 -04:00
Razgriz
93794b2148 Merge pull request #2270 from CHOMPStationBot/upstream-merge-10719 
[MIRROR] [MIRROR] Linter diagnostics + bans non-var relative pathing
 2021-06-25 00:17:19 -07:00
Nadyr
ee2a4bbc77 Merge pull request #2268 from CHOMPStationBot/upstream-merge-10610 
[MIRROR] Makes machinery destroyable by projectiles
 2021-06-23 19:09:41 -04:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Razgriz
968067d0e7 Merge pull request #2267 from CHOMPStationBot/upstream-merge-10725 
[MIRROR] Maybe fixes heroman's complaint
 2021-06-21 22:15:33 -07:00
Chompstation Bot
44a23181e6 Makes machinery destroyable by projectiles 2021-06-22 02:48:57 +00:00
Novacat
93cab8e8c6 Merge pull request #10725 from VOREStation/Arokha/lightmaybe 
Maybe fixes heroman's complaint
 2021-06-22 02:23:25 +00:00
Aronai Sieyes
a4027d273d Merge pull request #10608 from VOREStation/Arokha/emittersprites 
Port emitter sprites
 2021-06-21 15:07:43 +00:00
Novacat
f2d035cec0 Merge pull request #10711 from Hatterhat/wasted-waste 
timers and whatnot are printable now, actually
 2021-06-20 14:11:19 +00:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Aronai Sieyes
bf55685866 Merge pull request #10533 from VOREStation/Fixes/10465 
Fixes #10465
 2021-06-02 16:01:23 +00:00
Chompstation Bot
eb03a53185 Ports musical instruments from /tg/ 2021-06-01 20:29:51 +00:00
Nadyr
91231efce0 powder that makes you say yes 2021-05-27 22:43:47 -04:00
Nadyr
92e1743b5c Merge branch 'master' into upstream-merge-10401 2021-05-27 22:40:15 -04:00
Chompstation Bot
d76e756e5f [MIRROR] Reverts recipe changes from Industrial Expansion 2021-05-27 17:17:01 +00:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Chompstation Bot
d7f20396de Personal crafting & Dependencies 2021-05-11 22:43:33 -04:00
Nadyr
0bff1cd7e9 Update fuel_compressor.dm 2021-05-09 00:13:51 -04:00
Chompstation Bot
ca996648dd [MIRROR] Oops, I refactored Chemistry! 2021-05-08 23:59:34 -04:00
Chompstation Bot
588179bd66 Remove unnecessary 'signatures' 2021-04-08 16:48:30 +00:00
Nadyr
4ce40dad53 Merge pull request #1625 from CHOMPStationBot/upstream-merge-9955 
[MIRROR] [MIRROR] Added think-tanks.
 2021-03-26 03:50:02 -04:00
Chompstation Bot
fb6e49df04 [MIRROR] Fixes mapped R-UST connections, removes debug logs 2021-03-26 01:21:46 +00:00
Chompstation Bot
b7b8682e7c [MIRROR] Added think-tanks. 2021-03-18 14:57:26 +00:00
Nadyr
59c7fd5d6e Update telsa_construction.dm 2021-03-12 00:40:59 -05:00
Chompstation Bot
d2e828454f Updates the _vr recipies to include copper 2021-03-10 20:46:03 +00:00
Nadyr
e6d3089c18 Update fuel_compressor.dm 2021-03-10 01:13:09 -05:00
Chompstation Bot
2204cba6d8 [MIRROR] R-UST rises again. 2021-03-10 01:13:09 -05:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Novacat
5211edc9c0 Merge pull request #9573 from VOREStation/upstream-merge-7786 
[MIRROR] Gadgets & Gizmos
 2021-01-24 06:55:05 +00:00
Novacat
49ef2d2ee9 Merge pull request #8848 from Cyantime/spaceweirdness 
Remove gravity from debris field and rogue mining zones
 2020-11-14 06:49:05 +00:00
Razgriz
548c123e77 Merge pull request #760 from CHOMPStationBot/upstream-merge-9225 
[MIRROR] [MIRROR] Makes wall-mounted machines layer above windows
 2020-10-27 02:15:15 -07:00
Verkister
9848c0e719 Merge pull request #9225 from VOREStation/upstream-merge-7708 
[MIRROR] Makes wall-mounted machines layer above windows
 2020-10-27 08:16:29 +00:00
Nadyr
4835643840 Merge pull request #586 from cadyn/blitzrods 
Blitz rods
 2020-10-24 01:07:02 -04:00
Nadyr
fc677c62e9 Merge pull request #725 from CHOMPStationBot/upstream-merge-9220 
[MIRROR] [MIRROR] Tesla ball and containment field shock fixes
 2020-10-22 10:04:24 -04:00
Nadyr
9205e50340 Merge pull request #724 from CHOMPStationBot/upstream-merge-9221 
[MIRROR] [MIRROR] Make the tesla ball eventually run out of energy
 2020-10-22 10:03:06 -04:00
Nadyr
63d9df53b8 Update solar.dm 
Fixes upstream conflicts
 2020-10-22 09:47:30 -04:00
Verkister
68b59b03fb Merge pull request #9220 from VOREStation/upstream-merge-7702 
[MIRROR] Tesla ball and containment field shock fixes
 2020-10-19 10:40:00 +00:00
Verkister
56bd71350b Merge pull request #9221 from VOREStation/upstream-merge-7703 
[MIRROR] Make the tesla ball eventually run out of energy
 2020-10-19 10:39:52 +00:00
Chompstation Bot
7cdf3fed9d [MIRROR] Fix solar trackers sometimes vanishing when deconstructed 2020-10-19 10:39:21 +00:00
Cadyn
e14dd48263 Blitz rods 2020-10-14 16:14:40 -07:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
ShadowLarkens
3d7b051f2b Convert /material to /datum/material 2020-09-27 16:16:44 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
Novacat
4b83c18fb7 Merge pull request #9071 from VOREStation/upstream-merge-7660 
[MIRROR] Fix duplicate results from analyzing some objects
 2020-09-21 16:54:29 -04:00
Novacat
d49640431d Merge pull request #9062 from ShadowLarkens/tgui_finale 
NanoUI Goes To Brazil
 2020-09-21 14:13:16 -04:00
Meghan-Rossi
cbfd4789d7 Fix duplicate results from analyzing some objects (#7660) 2020-09-20 07:18:35 -04:00
Cerebulon
95ff8c2080 Tweaks to pickup/equip sounds. 2020-09-20 06:57:07 -04:00
ShadowLarkens
3f191e4204 NanoUI Goes To Brazil 2020-09-20 02:36:46 -07:00
ShadowLarkens
0f7d2b6e00 TGUI Turbine 2020-09-20 01:11:45 -07:00