cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,378 Commits 8 Branches 0 Tags
a7e5cce5b8dd4837f2cac8d25f0bd63a5b5122ec
Commit Graph

757 Commits

Author SHA1 Message Date
Nadyr
20e6781341 Merge pull request #2553 from CHOMPStationBot/upstream-merge-11080 
[MIRROR] Ports new Bay SolGov suits as Commonwealth suits
 2021-07-15 20:26:17 -04:00
Chompstation Bot
3d2783aec7 Ports new Bay SolGov suits as Commonwealth suits 2021-07-15 19:29:34 -04:00
Chompstation Bot
9acb3a208e Removes unnecessary, unused, and redundant helpers. 2021-07-14 17:57:22 +00:00
Nadyr
57e1641a43 Merge pull request #2531 from CHOMPStationBot/upstream-merge-11048 
[MIRROR] Reduce tgui logging
 2021-07-13 22:55:56 -04:00
Aronai Sieyes
a28df02a59 Merge pull request #11048 from VOREStation/Arokha/tguilog 
Reduce tgui logging
 2021-07-12 23:47:53 +00:00
Aronai Sieyes
85b0fbdd30 Merge pull request #11043 from VOREStation/Arokha/uavview 
Make UAVs not work at impossible distances
 2021-07-12 23:46:20 +00:00
Nadyr
e70d9f291c Merge pull request #2489 from CHOMPStationBot/upstream-merge-10996 
[MIRROR] Fix bitwise ops broken in caee8d45
 2021-07-10 02:35:57 -04:00
Nadyr
19630dcdcc Merge pull request #2477 from CHOMPStationBot/upstream-merge-10946 
[MIRROR] Makes time/tram use REALTIMEOFDAY rather than world.time
 2021-07-10 01:46:02 -04:00
Nadyr
ca3ccb5ff2 Merge branch 'master' into upstream-merge-10996 2021-07-10 01:42:08 -04:00
Nadyr
f27ac30e5a Merge pull request #2478 from CHOMPStationBot/upstream-merge-10979 
[MIRROR] Port current SSgarbage from /tg/
 2021-07-10 01:37:07 -04:00
Nadyr
7476daf3f8 powder that makes you say yes 2021-07-10 01:29:23 -04:00
Nadyr
96f0ab5e37 powder that makes you say yes 2021-07-10 01:27:04 -04:00
Nadyr
7285e94ef0 powder that makes you say yes 2021-07-10 01:25:10 -04:00
Chompstation Bot
db993cd583 Fix bitwise ops broken in caee8d45 2021-07-09 18:16:15 +00: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
8b3a896d98 Port current SSgarbage from /tg/ 2021-07-09 16:13:02 +00:00
Chompstation Bot
ffbd66852b Makes time/tram use REALTIMEOFDAY rather than world.time 2021-07-09 15:54:38 +00:00
Nadyr
56649cac06 Merge pull request #2439 from CHOMPStationBot/upstream-merge-10928 
[MIRROR] SSInput and Diagonal Movement
 2021-07-07 23:53:36 -04:00
Chompstation Bot
1513fbe0cb SSInput and Diagonal Movement 2021-07-07 18:35:44 +00:00
Chompstation Bot
6c3930fa81 Vore fixes 2021-07-07 15:50:29 +00:00
Razgriz
c5b59f129a Update logging.dm 2021-07-05 18:14:43 -07:00
Nadyr
78698322b8 Merge pull request #2417 from CHOMPStationBot/upstream-merge-10907 
[MIRROR] Fixes #10896
 2021-07-05 16:19:18 -04:00
Chompstation Bot
6b6a138221 Fixes #10896 2021-07-05 16:19:51 +00:00
Aronai Sieyes
90768085c8 Merge pull request #10890 from VOREStation/Arokha/hairfix 
Fixes #10884
 2021-07-05 06:32:31 +00:00
Chompstation Bot
9eeb02ce42 Various HUD job icons additions and adjustments 2021-07-04 02:11:03 +00:00
Chompstation Bot
e0ff2b4ffe Port various backpacks 2021-07-04 00:38:04 +00:00
Razgriz
e3a9cd3775 Merge branch 'master' into upstream-merge-10764 2021-07-03 00:26:13 -07:00
Chompstation Bot
bf04ca9003 Port /tg/ vis_contents openspace 2021-06-30 19:49:25 +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
Chompstation Bot
087c7b63be [MIRROR] Refactors posters to use decls 2021-06-21 02:22:59 +00:00
Nadyr
3e28ef7ce2 Merge pull request #2235 from CHOMPStationBot/upstream-merge-10695 
[MIRROR] [MIRROR] Improves select_recipe.
 2021-06-19 21:49:54 -04:00
Nadyr
4157f9b13b Merge branch 'CHOMPStation2:master' into upstream-merge-10687 2021-06-19 21:39:33 -04:00
Novacat
a35d6f402d Merge pull request #10695 from VOREStation/upstream-merge-8141 
[MIRROR] Improves select_recipe.
 2021-06-19 03:38:38 +00:00
Razgriz
b008ca0762 Merge pull request #2221 from CHOMPStationBot/upstream-merge-10661 
[MIRROR] Add a new contamination
 2021-06-18 18:43:41 -07:00
Novacat
86e0bbb3e2 Merge pull request #10687 from VOREStation/Arokha/camerablock 
Fix cameras having emissive blockers visible
 2021-06-18 19:21:54 +00:00
Novacat
9074fc916f Merge pull request #10661 from lbnesquik/Branch-Wet 
Add a new contamination
 2021-06-18 04:28:22 +00:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Nadyr
39ac327e33 Merge pull request #2123 from Verkister/patch-15 
Adds a bunch of stuff to trash eater list
 2021-06-03 05:21:47 -04:00
Verkister
83b5051804 Update global_lists_vr.dm 2021-06-02 23:20:57 +03:00
Verkister
85a79d2cf6 Update global_lists_vr.dm 2021-06-02 20:01:38 +03:00
Verkister
f3d09944b7 Adds a bunch of stuff to trash eater list 
Might push changes upstream too if I can be arsed to.

Added MRE bags, cracker and chocolate packs, pizza vouchers and boxes, the other toy subtype, seeds, some accessories, bibles, horns/ducks, torn inflatable doors, and towels.
 2021-06-02 19:56:05 +03:00
Aronai Sieyes
50c69ffd77 Merge pull request #10528 from VOREStation/Arokha/ghostmusic 
Allow ghosts to partake in music
 2021-06-02 16:01:48 +00:00
Chompstation Bot
701ddb7bc7 Media tracks subsystem, jukebox UI genres 2021-06-01 20:53:39 +00:00
Chompstation Bot
4476e4104d Ports Runechat 2021-05-30 22:51:20 +00:00
Nadyr
0f6f622cd9 Merge pull request #2056 from CHOMPStationBot/upstream-merge-10316 
[MIRROR] [MIRROR] Ports Nebula's Discord Webhook Integration
 2021-05-27 21:36:38 -04:00
Nadyr
a74d6c1703 powder that makes you say yes 2021-05-27 19:07:48 -04:00
Chompstation Bot
34143b83cf [MIRROR] Ports Nebula's Discord Webhook Integration 2021-05-27 16:35:07 +00:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Chompstation Bot
e432a9e7ac Add portable mapping devices 2021-05-22 19:26:57 +00:00