cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
67,290 Commits 6 Branches 0 Tags
ffe20e56ef40b5bec6de85b69d82d08bdfe3be78
Commit Graph

778 Commits

Author SHA1 Message Date
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
Aronai Sieyes
bc6564deb6 Merge pull request #10335 from VOREStation/Arokha/dels 
Various qdel helpers
 2021-05-20 19:05:42 +00:00
Nadyr
b8902367c6 Merge pull request #1896 from CHOMPStationBot/upstream-merge-10243 
[MIRROR] Personal crafting & Dependencies
 2021-05-11 23:10:42 -04:00
Nadyr
4c384b2861 Merge pull request #1929 from CHOMPStationBot/upstream-merge-10286 
[MIRROR] Adds subsystem crash logging to SSprocess and SSmobs
 2021-05-11 23:10:20 -04:00
Chompstation Bot
d7f20396de Personal crafting & Dependencies 2021-05-11 22:43:33 -04:00
Novacat
866824fa85 Merge pull request #10280 from VOREStation/Arokha/multiore 
Allow more than one ore processor
 2021-05-11 13:06:25 +00:00
Novacat
1358ad8867 Merge pull request #10286 from VOREStation/Arokha/SSabandonship 
Adds subsystem crash logging to SSprocess and SSmobs
 2021-05-11 13:05:58 +00:00
Chompstation Bot
36db9dad68 Fixes traits not getting applied properly. 2021-04-12 14:34:01 +00:00
Nadyr
b29050d476 Merge branch 'master' into upstream-merge-10105 2021-04-11 06:29:26 -04:00
Nadyr
8ad86ed1f8 Merge branch 'master' into upstream-merge-10033 2021-04-11 04:45:06 -04:00
Chompstation Bot
b421878f3f Fixes Traits 2021-04-09 01:21:15 +00:00
Chompstation Bot
588179bd66 Remove unnecessary 'signatures' 2021-04-08 16:48:30 +00:00
Chompstation Bot
43072b15c2 Trait Rebalance and Refactor 2021-04-07 19:40:58 +00:00
Nadyr
81d55a1cb2 Merge pull request #1682 from MisterGrimm/Genaprawns 
Player Xenomorph Overhaul 1.1 , the Genaprawns
 2021-03-28 21:53:36 -04:00
Nadyr
4a8c021ea4 Update global_lists_vr.dm 2021-03-28 00:27:49 -04:00
Sym
8ca11f0439 Changing player Xenomorphs to Genaprawns 2021-03-26 19:42:08 -04:00
Chompstation Bot
8db3a020a0 Micro March beta update. 2021-03-26 23:23:02 +00:00
Nadyr
a85ee7115f Merge branch 'master' into upstream-merge-9924 2021-03-21 03:35:47 -04:00
Nadyr
48d8812b9e Update global_lists_vr.dm 2021-03-21 02:00:04 -04:00
Nadyr
95a2350221 Update global_lists.dm 2021-03-21 01:24:14 -04:00
Chompstation Bot
2a5c21c8f5 [MIRROR] Kaleidoscope 2: The Retabbening 2021-03-21 01:24:14 -04:00
Chompstation Bot
006cc9fa0e Fixes Custom Species Base Selection 2021-03-12 05:25:32 +00:00
Novacat
6af8ca393b Merge pull request #9900 from VOREStation/upstream-merge-7958 
[MIRROR] Fixes context-menu examine expanding incorrect target
 2021-03-10 19:46:45 +00:00
Novacat
1d0ca9dd1e Merge pull request #9867 from VOREStation/upstream-merge-7928 
[MIRROR] Added a GPS compass.
 2021-03-09 22:59:48 +00:00
Novacat
955be2e5fe Merge pull request #9876 from VOREStation/upstream-merge-7953 
[MIRROR] Fixed/generalized loadout implants.
 2021-03-08 16:53:20 +00:00
cadyn
fc25da825e Revert "Fix ghost double comms with new link allinone" 2021-03-05 14:00:51 -08:00
Razgriz
01fc087eeb Merge pull request #1460 from CHOMPStation2/cadyn-patch-9 
Fix bullets I guess
 2021-03-04 02:15:20 -07:00
Cadyn
7cae69b7c9 Fix ghost double comms with link allinone 2021-03-03 23:39:03 -08:00
cadyn
067fbe283d Update mobs.dm 2021-02-28 19:33:10 -08:00
cadyn
b4d1f6d520 Fix bullets I guess 2021-02-28 19:23:38 -08:00