cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-26 01:04:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
64,054 Commits 8 Branches 0 Tags
0028ef1ef00ca06ba675ddc1bcdf935c0283feb7
Commit Graph

5905 Commits

Author SHA1 Message Date
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
Nadyr
e0f6cb84c9 Merge branch 'master' into upstream-merge-10050 2021-05-09 06:13:32 -04:00
Nadyr
1f33d5696f Merge pull request #1900 from CHOMPStationBot/upstream-merge-10236 
[MIRROR] Toys expansion
 2021-05-08 23:50:05 -04:00
Nadyr
c1e068bd90 Update toys_vr.dm 2021-05-08 08:29:58 -04:00
Nadyr
375167cd63 Merge pull request #1907 from CHOMPStationBot/upstream-merge-10178 
[MIRROR] New belt items
 2021-05-08 08:11:11 -04:00
Aronai Sieyes
93124538dd Merge pull request #10178 from dwinters99/light-replacer 
New belt items
 2021-05-06 17:58:51 +00:00
Novacat
3245498530 Merge pull request #10236 from dwinters99/toys 
Toys expansion
 2021-05-06 14:42:49 +00:00
Chompstation Bot
55cb88b4a9 [MIRROR] Ported the Bay/Nebula emote system. 2021-05-05 18:45:31 +00:00
Chompstation Bot
fd5b2f094f [MIRROR] Moves material stacks to modules/materials 2021-04-28 16:38:58 +00:00
Razgriz
97140d5311 Merge pull request #1832 from CHOMPStationBot/upstream-merge-10175 
[MIRROR] Changes blueprints to use ChangeArea
 2021-04-21 21:45:13 -07:00
Novacat
d25749a8b3 Merge pull request #10175 from Novacat/nova-ert 
Changes blueprints to use ChangeArea
 2021-04-20 22:41:11 +00:00
Chompstation Bot
2856028342 Captain's Rapier 2021-04-20 16:50:56 +00:00
Shadowfire
71daa80a80 Implants and Mechs from a dispenser? Oh my! 
Added prizes to casino, and also small rework for streamlining of ckey work. Poor Kassc has to spend hours adding hundreds of items for you guys to enjoy after these casino events!
 2021-04-15 01:14:06 +02:00
Chompstation Bot
588179bd66 Remove unnecessary 'signatures' 2021-04-08 16:48:30 +00:00
Nadyr
1c6390c1e3 Merge pull request #1706 from CHOMPStationBot/upstream-merge-10046 
[MIRROR] [MIRROR] Tanning Tweaks
 2021-04-02 23:29:50 -04:00