cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-09 16:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,285 Commits 10 Branches 0 Tags
c7a71bc5996fe35236c6910c1893aae66b1a2460
Commit Graph

19330 Commits

Author SHA1 Message Date
Aronai Sieyes
c7a71bc599 Merge pull request #11497 from VOREStation/upstream-merge-8239 
[MIRROR] Makes Fumo Un-Huge
 2021-08-26 17:38:41 +00:00
Nadyr
145f8172f4 Merge pull request #2843 from CHOMPStationBot/upstream-merge-11464 
[MIRROR] Stun Revolver Fix
 2021-08-25 23:42:35 -04:00
Nadyr
ed6c321187 Merge pull request #2891 from CHOMPStationBot/upstream-merge-11478 
[MIRROR] [MIRROR] Added tabloid magazines.
 2021-08-25 23:40:45 -04:00
Nadyr
454b7c25db Merge pull request #2889 from CHOMPStationBot/upstream-merge-11483 
[MIRROR] Adds the ability to ban people from ghost roles
 2021-08-25 23:38:36 -04:00
Nadyr
67eaef4886 Merge branch 'master' into upstream-merge-11464 2021-08-25 23:32:47 -04:00
Nadyr
e4d8e5263e Merge branch 'master' into upstream-merge-11434 2021-08-25 23:19:08 -04:00
Nadyr
56d22684cc powder that makes you say yes 2021-08-25 23:18:21 -04:00
Nadyr
228cc8e096 powder that makes you say yes 2021-08-25 23:17:27 -04:00
Nadyr
4d023f33f1 powder that makes you say yes 2021-08-25 23:15:44 -04:00
Nadyr
f19dc1b2eb Merge pull request #2874 from cadyn/upstream-merge-11421 
Merge Upstream Pull Request 11421
 2021-08-25 22:38:53 -04:00
Nadyr
8ebb7450a3 powder that makes you say yes 2021-08-25 22:18:11 -04:00
Nadyr
779c8ab9e6 Merge pull request #2869 from cadyn/upstream-merge-11412 
Merge Upstream Pull Request 11412
 2021-08-25 22:01:13 -04:00
Nadyr
0d3076d6b4 Merge pull request #2867 from cadyn/upstream-merge-11408 
Merge Upstream Pull Request 11408
 2021-08-25 21:59:52 -04:00
Nadyr
e0b3a41696 powder that makes you say yes 2021-08-25 21:46:16 -04:00
Nadyr
e142d328ee powder that makes you say yes 2021-08-25 21:43:39 -04:00
Nadyr
ad5441a144 powder that makes you say yes 2021-08-25 21:25:20 -04:00
Nadyr
835c587224 Merge pull request #2866 from cadyn/upstream-merge-11404 
Merge Upstream Pull Request 11404
 2021-08-25 21:23:07 -04:00
Chompstation Bot
03adfb863f [MIRROR] Added tabloid magazines. 2021-08-25 13:19:56 +00:00
Chompstation Bot
aba07d1109 Adds the ability to ban people from ghost roles 2021-08-25 13:18:40 +00:00
Novacat
ab680fd295 Upstream-11434 2021-08-24 21:11:09 -07:00
Aronai Sieyes
72f5e790db Upstream-11421 2021-08-24 21:10:20 -07:00
Aronai Sieyes
6eb1da72db Upstream-11412 2021-08-24 21:09:52 -07:00
Aronai Sieyes
e19a87e44a Upstream-11408 2021-08-24 21:09:43 -07:00
Aronai Sieyes
ed4e55f811 Merge pull request #11404 from VOREStation/Arokha/fridge 
Fridge/wall locker animation fixes
 2021-08-24 21:09:22 -07:00
Nadyr
88ea62510a Merge branch 'master' into upstream-merge-11459 2021-08-24 23:23:57 -04:00
Nadyr
a7af370a6d powder that makes you say yes 2021-08-24 23:17:52 -04:00
Nadyr
c65258a4c7 Merge pull request #2860 from CHOMPStationBot/upstream-merge-11439 
[MIRROR] Ports RD labcoat from CitRP
 2021-08-24 23:15:42 -04:00
Aronai Sieyes
c1632a1c71 Merge pull request #11439 from PastelPrinceDan/rdlabcoat 
Ports RD labcoat from CitRP
 2021-08-24 23:06:09 -04:00
Nadyr
7c95d00648 powder that makes you say yes 2021-08-24 23:03:01 -04:00
Nadyr
6c91cb7292 Merge branch 'master' into upstream-merge-11456 2021-08-24 23:02:14 -04:00
Nadyr
2a876c6885 Merge pull request #2862 from CHOMPStationBot/upstream-merge-11431 
[MIRROR] Add rollover safety check
 2021-08-24 22:58:01 -04:00
Nadyr
119b23b280 Merge pull request #2855 from CHOMPStationBot/upstream-merge-11442 
[MIRROR] Fulpstation Briefcases
 2021-08-24 22:57:13 -04:00
Nadyr
c595ddc4ca Merge pull request #2857 from CHOMPStationBot/upstream-merge-11446 
[MIRROR] [MIRROR] Randomized Vendor Spawners for Mapping
 2021-08-24 22:48:48 -04:00
Aronai Sieyes
64e0604641 Merge pull request #11431 from VOREStation/Arokha/rolloversafety 
Add rollover safety check
 2021-08-25 00:00:48 +00:00
Aronai Sieyes
c03ad3a5d5 Merge pull request #11446 from VOREStation/upstream-merge-8216 
[MIRROR] Randomized Vendor Spawners for Mapping
 2021-08-25 00:00:16 +00:00
Aronai Sieyes
c37ae601b6 Merge pull request #11442 from GhostActual/baggage 
Fulpstation Briefcases
 2021-08-25 00:00:00 +00:00
Chompstation Bot
dc5e465c07 Fix rollover even harder 2021-08-24 23:59:23 +00:00
Chompstation Bot
e209b4cfb2 Adds winter coats to their respective lockers/vendors 2021-08-24 23:59:02 +00:00
Chompstation Bot
593dd3ea79 Stun Revolver Fix 2021-08-24 23:58:41 +00:00
Chompstation Bot
d189c9a12f Crusher Gaming 2021-08-24 23:58:27 +00:00
Rykka
0151c0ad23 Change Commonwealth References added by #2553 to Solgov 
https://github.com/CHOMPStation2/CHOMPStation2/pull/2553

Added Commonwealth voidsuits from Bay.

Changed these to Solgov to address https://github.com/CHOMPStation2/CHOMPStation2/issues/2598

<3
 2021-08-15 15:34:30 -07:00
Nadyr
274538cf73 Merge pull request #2792 from CHOMPStationBot/upstream-merge-11399 
[MIRROR] Add proc to just reset database connections
 2021-08-15 01:05:28 -04:00
Nadyr
5369fa7b24 powder that makes you say yes 2021-08-15 00:36:12 -04:00
Nadyr
7ca928ccf9 powder that makes you say yes 2021-08-15 00:09:48 -04:00
Razgriz
049030f789 Merge pull request #2778 from CHOMPStation2/Razgriz1032-patch-1 
Change occupation selection color of pilot to be clearly listed as ex…
 2021-08-14 17:07:05 -07:00
Razgriz
ca5f0ca5c9 Update exploration_vr.dm 2021-08-14 04:39:08 -07:00
Nadyr
c8ff410f64 Merge pull request #2790 from CHOMPStationBot/upstream-merge-11396 
[MIRROR] Fix Salamanders and Wall-lockers
 2021-08-13 23:46:21 -04:00
Nadyr
5eed3f3616 Merge pull request #2788 from CHOMPStationBot/upstream-merge-11384 
[MIRROR] Virology Revamp
 2021-08-13 23:40:19 -04:00
Nadyr
b758eaf0ba Merge pull request #2787 from CHOMPStationBot/upstream-merge-11392 
[MIRROR] Fancy Lifeboats
 2021-08-13 23:03:55 -04:00
Chompstation Bot
49df49559d Add proc to just reset database connections 2021-08-13 15:41:09 +00:00