cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-18 21:33:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
64,362 Commits 10 Branches 0 Tags
f49e08b8ebdc458a646cbb98201224a4bb98fd86
Commit Graph

5919 Commits

Author SHA1 Message Date
Nadyr
f49e08b8eb Merge pull request #2237 from CHOMPStationBot/upstream-merge-10696 
[MIRROR] Tweaks the denecrotizer
 2021-06-19 21:51:34 -04:00
Nadyr
374e896bfc Merge pull request #2212 from CHOMPStationBot/upstream-merge-10660 
[MIRROR] ITV Merchandise (Talon Gear)
 2021-06-19 21:25:44 -04:00
Chompstation Bot
3b5ab4d9a6 Tweaks the denecrotizer 2021-06-19 03:39:53 +00:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Chompstation Bot
52be7df6fc ITV Merchandise (Talon Gear) 2021-06-17 19:50:08 +00:00
Novacat
8d0a7af731 Merge pull request #10656 from ShadowLarkens/multitool_and_attackby_fix 
Make item/attackby call ..(), multitool tool quality fix
 2021-06-15 22:59:41 +00:00
Chompstation Bot
a94e471add Material Container Component & Autolathe QoL 2021-06-13 03:18:30 +00:00
Aronai Sieyes
4edcaa7908 Merge pull request #10611 from VOREStation/upstream-merge-8123 
[MIRROR] stops armour plate and armour plate inserts having the same name, and…
 2021-06-11 19:22:01 +00:00
Nadyr
2c4d2d21f4 Merge pull request #2162 from CHOMPStationBot/upstream-merge-10598 
[MIRROR] Exploration Duffle Fix
 2021-06-09 18:17:17 -04:00
Novacat
4f546ba6f7 Merge pull request #10598 from klaasjared/explo-duffle-fix 
Exploration Duffle Fix
 2021-06-09 14:42:19 +00:00
Novacat
367bbcb329 Merge pull request #10600 from Verkister/patch-56 
Fixes belly sensor jamming
 2021-06-09 14:22:37 +00:00
Nadyr
4db0aee294 Merge pull request #2150 from CHOMPStationBot/upstream-merge-10584 
[MIRROR] Explorer storage items
 2021-06-08 01:39:37 -04:00
Chompstation Bot
c753eb778a Explorer storage items 2021-06-07 19:37:53 -04:00
Chompstation Bot
e846fa7b82 [MIRROR] Adds new UI for secure stuff 2021-06-07 05:32:43 +00:00
Nadyr
03761337c1 Merge pull request #2121 from CHOMPStationBot/upstream-merge-10535 
[MIRROR] Chessboard Holodeck TG-Style.
 2021-06-03 05:17:08 -04:00
Aronai Sieyes
07cb7850ce Merge pull request #10535 from SpaceVampire/Chess 
Chessboard Holodeck TG-Style.
 2021-06-02 16:03:06 +00:00
Aronai Sieyes
958558168b Merge pull request #10529 from VOREStation/Fixes/10526 
Fixes #10526
 2021-06-02 16:00:10 +00:00
Nadyr
752123834b Merge pull request #2107 from CHOMPStationBot/upstream-merge-10518 
[MIRROR] Ports musical instruments from /tg/
 2021-06-02 02:54:38 -04:00
Nadyr
4fba3e19fb delete yw file conflicting with upstream music changes 2021-06-02 00:21:18 -04:00
Nadyr
095156f9e4 powder that makes you say yes 2021-06-01 23:35:20 -04:00
Chompstation Bot
eb03a53185 Ports musical instruments from /tg/ 2021-06-01 20:29:51 +00:00
Novacat
08180ba0f1 Merge pull request #10409 from TheDavestDave/master 
explo vender stuff
 2021-06-01 14:58:32 +00:00
Chompstation Bot
78acd45edc Remove extra asterisks from rune audible messages 2021-05-31 17:26:54 +00:00
Nadyr
366fd4f97b Merge pull request #2086 from CHOMPStationBot/upstream-merge-10479 
[MIRROR] Ports Runechat
 2021-05-31 03:11:13 -04:00
Nadyr
a3f4c8247a Merge pull request #2087 from CHOMPStationBot/upstream-merge-10450 
[MIRROR] Allow multiple SStranscore databases
 2021-05-31 02:49:34 -04:00
Aronai Sieyes
9134933442 Allow multiple SStranscore databases (#10450) 
* Allow multiple SStranscore databases

* Add key to backup implanter too

* Key passing tweak

* Fix issue Leshana spotted

* Add optimization Leshana spotted

* Fixxy more multitranscore bugs
 2021-05-30 22:53:28 +00:00
Chompstation Bot
4476e4104d Ports Runechat 2021-05-30 22:51:20 +00:00
Nadyr
24c35497ff powder that makes you say yes 2021-05-29 22:20:06 -04:00
Chompstation Bot
501f383da4 [MIRROR] Make figurines small instead of normal sized 2021-05-29 18:55:11 +00:00
Nadyr
92e1743b5c Merge branch 'master' into upstream-merge-10401 2021-05-27 22:40:15 -04:00
Nadyr
d20b48d2a3 powder that makes you say yes 2021-05-27 22:00:18 -04:00
Nadyr
ce20d09e0c Merge pull request #2054 from CHOMPStationBot/upstream-merge-10433 
[MIRROR] [MIRROR] Linter Introduction + Cleanup
 2021-05-27 21:35:05 -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
d52c1e61e8 Aro shipself v3 2021-05-27 01:10:08 +00:00
Novacat
de885495b6 Merge pull request #10406 from Screemonster/contranslocatorband 
Removes contraband descriptor from translocators.
 2021-05-24 05:29:56 +00:00
Nadyr
3beacb065e Merge pull request #2011 from CHOMPStationBot/upstream-merge-10398 
[MIRROR] [MIRROR] Wall-mounted Geiger Counters
 2021-05-23 23:05:11 -04:00
Chompstation Bot
2b3041e7b6 [MIRROR] Wall-mounted Geiger Counters 2021-05-23 22:27:56 +00:00
Novacat
53fae19217 Merge pull request #10391 from ShadowLarkens/rpd_fix 
Fix only the first RPD ever interacted with working
 2021-05-23 16:31:01 +00:00
Nadyr
5f60a47e86 Merge pull request #1990 from CHOMPStationBot/upstream-merge-10368 
[MIRROR] [MIRROR] Food 4 thought
 2021-05-21 18:59:31 -04:00
Novacat
d9fb7b0a42 Merge pull request #10368 from VOREStation/upstream-merge-8083 
[MIRROR] Food 4 thought
 2021-05-21 20:00:24 +00:00
Aronai Sieyes
bc6564deb6 Merge pull request #10335 from VOREStation/Arokha/dels 
Various qdel helpers
 2021-05-20 19:05:42 +00:00
Novacat
23d3beed44 Merge pull request #10344 from KillianKirilenko/kk-misc2 
Explorer/Pilot ID & Locker Addons
 2021-05-17 16:55:19 +00:00
Novacat
111cd2a1ad Merge pull request #10328 from klaasjared/pilot_fix 
Pilot Headset Fix
 2021-05-15 11:56:58 +00:00
Nadyr
e157d0bf79 Merge pull request #1939 from CHOMPStationBot/upstream-merge-10257 
[MIRROR] Changes some Exploration Colors
 2021-05-11 23:56:27 -04:00
Chompstation Bot
d7f20396de Personal crafting & Dependencies 2021-05-11 22:43:33 -04:00
Razgriz
c4ca47fb5e Merge pull request #1936 from CHOMPStationBot/upstream-merge-10276 
[MIRROR] [MIRROR] The Personal Computer Unit
 2021-05-11 15:51:54 -07:00
Novacat
2027165318 Merge pull request #10257 from Novacat/nova-ert 
Changes some Exploration Colors
 2021-05-11 13:07:03 +00:00
Novacat
7c0a30ab09 Merge pull request #10276 from VOREStation/upstream-merge-8069 
[MIRROR] The Personal Computer Unit
 2021-05-11 13:06:43 +00:00
Novacat
ff41a0fc27 Merge pull request #10269 from Heroman3003/jam-them-sensors 
Adds Jams Sensors belly mode addon
 2021-05-09 12:55:44 +00:00