cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-30 03:05:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,356 Commits 9 Branches 0 Tags
425fca482d59e89d28fa90e49a7a4edbd40bddad
Commit Graph

1687 Commits

Author SHA1 Message Date
Aronai Sieyes
5c5aaa1887 Merge pull request #11058 from VOREStation/Arokha/entertain 
Make tvcamera and entertainment monitor FANCY
 2021-07-14 18:39:39 +00:00
Nadyr
a803e5175f Merge pull request #2493 from CHOMPStationBot/upstream-merge-11002 
[MIRROR] Move like every clothing icon file
 2021-07-13 22:21:08 -04:00
Aronai Sieyes
27545a7859 Merge pull request #11010 from VOREStation/Arokha/qpadlink 
Fix some bugs
 2021-07-10 20:12:23 +00:00
Chompstation Bot
16a731dd39 Move like every clothing icon file 2021-07-10 16:23:23 +00:00
Nadyr
49866902a7 Merge pull request #2479 from CHOMPStationBot/upstream-merge-10980 
[MIRROR] Expands do_after/do_mob exclusive var to affect target
 2021-07-10 01:30:52 -04:00
Aronai Sieyes
f835374f26 Merge pull request #10980 from MarinaGryphon/issue/8289 
Expands do_after/do_mob exclusive var to affect target
 2021-07-09 16:14:12 +00:00
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Aronai Sieyes
78eb4608d2 Merge pull request #10923 from VOREStation/Arokha/mult 
Fix multitool runtime
 2021-07-05 23:57:53 +00:00
Chompstation Bot
14129d60cf Converts visible_message notice spans to look more like emotes 2021-07-05 20:30:12 +00:00
Nadyr
f9d4c77fe1 Merge pull request #2416 from CHOMPStationBot/upstream-merge-10909 
[MIRROR] Fixes a few issues with brackets being escaped when they shouldn't be.
 2021-07-05 15:56:53 -04:00
Aronai Sieyes
bcc80d1bbb Merge pull request #10909 from MarinaGryphon/bracketfixes 
Fixes a few issues with brackets being escaped when they shouldn't be.
 2021-07-05 16:17:41 +00:00
Aronai Sieyes
1fa01995cf Merge pull request #10894 from VOREStation/Arokha/3more 
Add 3 more things banned from openspace
 2021-07-05 06:40:07 +00:00
Nadyr
27ca2cdda6 Merge pull request #2373 from CHOMPStationBot/upstream-merge-10842 
[MIRROR] More glowy
 2021-07-03 20:48:07 -04:00
Aronai Sieyes
165756365b Merge pull request #10843 from VOREStation/Arokha/flashfix 
Fix flashlight off clicks
 2021-07-03 21:22:15 +00:00
Chompstation Bot
ca63950725 More glowy 2021-07-03 21:20:48 +00:00
Nadyr
e2ef6972b6 Merge pull request #2312 from CHOMPStationBot/upstream-merge-10761 
[MIRROR] Add ghostjoin VV helper
 2021-07-01 21:30:58 -04:00
Nadyr
e18d99d3e1 Merge pull request #2311 from CHOMPStationBot/upstream-merge-10752 
[MIRROR] The One Where You Can Aim Lights
 2021-07-01 21:30:46 -04:00
Nadyr
c977771efb powder that makes you say yes 2021-07-01 21:08:23 -04:00
Aronai Sieyes
97ff98adf1 Merge pull request #10761 from VOREStation/Arokha/denhelp 
Add ghostjoin VV helper
 2021-06-30 19:30:48 +00:00
Chompstation Bot
15fd9df408 The One Where You Can Aim Lights 2021-06-30 19:29:41 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Razgriz
096246abff Merge pull request #2247 from cadyn/upstream-merge-10476 
Manual Mirror Vorestation #10476
 2021-06-20 17:14:14 -07:00
Razgriz
582053257d Update denecrotizer_vr.dm 2021-06-20 16:13:27 -07: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
Aronai Sieyes
ac00965e68 cock 2021-06-19 22:03:38 -07:00
Nadyr
f49e08b8eb Merge pull request #2237 from CHOMPStationBot/upstream-merge-10696 
[MIRROR] Tweaks the denecrotizer
 2021-06-19 21:51:34 -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
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
Novacat
367bbcb329 Merge pull request #10600 from Verkister/patch-56 
Fixes belly sensor jamming
 2021-06-09 14:22:37 +00:00
Chompstation Bot
c753eb778a Explorer storage items 2021-06-07 19:37:53 -04: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
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
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
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
Novacat
de885495b6 Merge pull request #10406 from Screemonster/contranslocatorband 
Removes contraband descriptor from translocators.
 2021-05-24 05:29:56 +00:00
Chompstation Bot
2b3041e7b6 [MIRROR] Wall-mounted Geiger Counters 2021-05-23 22:27:56 +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
111cd2a1ad Merge pull request #10328 from klaasjared/pilot_fix 
Pilot Headset Fix
 2021-05-15 11:56:58 +00:00
Chompstation Bot
d7f20396de Personal crafting & Dependencies 2021-05-11 22:43:33 -04: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
Chompstation Bot
588179bd66 Remove unnecessary 'signatures' 2021-04-08 16:48:30 +00:00