cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-23 07:43:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,137 Commits 9 Branches 0 Tags
bdf7cff2232ebd1300ec8d898aaa763f8faf3bcb
Commit Graph

19290 Commits

Author SHA1 Message Date
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
Chompstation Bot
f5212e0053 Fix Salamanders and Wall-lockers 2021-08-13 15:40:58 +00:00
Chompstation Bot
beef8e7f82 Virology Revamp 2021-08-13 15:38:46 +00:00
Chompstation Bot
cbd1953061 Fancy Lifeboats 2021-08-13 15:38:40 +00:00
Razgriz
df0eafe8de Merge pull request #2774 from lbnesquik/Kot-message-vorny 
Make it possible for a player to send a message when someone tries spawning to them
 2021-08-12 20:25:11 -07:00
Nadyr
6b5aad478a Merge pull request #2776 from CHOMPStationBot/upstream-merge-11387 
[MIRROR] Fixes infinite material duplication in R&D
 2021-08-11 20:47:50 -04:00
Razgriz
8a3bcea22e Change occupation selection color of pilot to be clearly listed as explorer job 2021-08-11 00:39:15 -07:00
Novacat
b291d87e18 Merge pull request #11387 from Heroman3003/dupefix 
Fixes infinite material duplication in R&D
 2021-08-11 02:51:43 +00:00
Aronai Sieyes
4a39834222 Merge pull request #11385 from Very-Soft/maintpredintro 
Adds extra text to maint pred and morph spawns
 2021-08-10 23:12:09 +00:00
lbnesquik
4761f0f4f0 Make it possible for pred to send a message when someone tries spawning in your gut 2021-08-10 13:07:24 +02:00
Nadyr
1bfc1eed7d Merge pull request #2763 from CHOMPStationBot/upstream-merge-11368 
[MIRROR] Port of monster860's animated doors to Bay closets
 2021-08-09 18:47:36 -04:00
Nadyr
d2e0ae0550 Merge pull request #2759 from CHOMPStationBot/upstream-merge-11360 
[MIRROR] Fancy exploration shuttle
 2021-08-09 18:45:46 -04:00
Aronai Sieyes
7463a1bd6e Merge pull request #11368 from VOREStation/Arokha/closetanim 
Port of monster860's animated doors to Bay closets
 2021-08-09 03:28:57 +00:00
Chompstation Bot
ee735270ec Fancy exploration shuttle 2021-08-08 18:48:28 +00:00
lbnesquik
a67693dc35 Deletes all of the annoucement code to fix this stupid issue i am so upset >:( 2021-08-08 17:27:19 +02:00
lbnesquik
88eeb87f71 Fixes broken spawn points by turning on the variable 2021-08-08 16:33:04 +02:00
lbnesquik
193484f295 Comments 2021-08-08 10:25:08 +02:00
lbnesquik
65625ec033 Comments 2021-08-08 10:18:33 +02:00
lbnesquik
baa29e15a6 Updates to actually compile 2021-08-08 03:17:54 +02:00
lbnesquik
29c63c2458 Merge branch 'master' of https://github.com/CHOMPStation2/CHOMPStation2 into Kot-message 2021-08-08 03:08:52 +02:00
Razgriz
40278c3bcd Merge pull request #2741 from CHOMPStationBot/upstream-merge-11341 
[MIRROR] Fancy sprited shuttles
 2021-08-07 15:13:48 -07:00
Razgriz
fccca84940 Merge pull request #2733 from CHOMPStationBot/upstream-merge-11348 
[MIRROR] Port/add throwing subsystem
 2021-08-06 23:11:49 -07:00
Razgriz
dc1f939744 Merge pull request #2739 from CHOMPStationBot/upstream-merge-11342 
[MIRROR] Skyrat connected consoles
 2021-08-06 22:37:16 -07:00
Razgriz
5eacec4043 Merge pull request #2736 from CHOMPStationBot/upstream-merge-11336 
[MIRROR] Skyrat extinguisher cabinet sprites
 2021-08-06 22:30:34 -07:00
lbnesquik
83b7b4c75d Attempts to make it possible to vore belly spawn without an annoucement 2021-08-07 06:52:13 +02:00
Chompstation Bot
2967ef4416 Fancy sprited shuttles 2021-08-06 22:15:49 +00:00
Aronai Sieyes
8cfb426ef7 Merge pull request #11342 from VOREStation/Arokha/connectedfancycomps 
Skyrat connected consoles
 2021-08-06 21:47:09 +00:00
Aronai Sieyes
a66ac79179 Merge pull request #11336 from VOREStation/Icons/skyratexting 
Skyrat extinguisher cabinet sprites
 2021-08-06 15:36:06 +00:00
Chompstation Bot
5043e01b85 Port/add throwing subsystem 2021-08-06 15:01:16 +00:00
Aronai Sieyes
530c13bbbc Merge pull request #11345 from VOREStation/Arokha/removestub 
Remove pointless /Crossed stub
 2021-08-06 14:51:53 +00:00
Aronai Sieyes
b93b572626 Merge pull request #11331 from VOREStation/Icons/skyratbenches 
Skyrat benches
 2021-08-04 02:50:20 +00:00
Nadyr
c1256426da Merge branch 'master' into upstream-merge-11324 2021-08-01 17:49:14 -04:00
Nadyr
f0d5ea81a4 Merge pull request #2710 from CHOMPStationBot/upstream-merge-10773 
[MIRROR] [MIRROR] Adds optional area-based definition for outdoors-ness
 2021-08-01 17:47:09 -04:00
Nadyr
b942e02a7b powder that makes you say yes 2021-08-01 17:30:48 -04:00
Nadyr
d6b32818b8 Merge pull request #2709 from CHOMPStationBot/upstream-merge-11177 
[MIRROR] Reworks Shadekin eyecolors (again)
 2021-08-01 16:11:54 -04:00
Nadyr
e9b3941615 Merge pull request #2707 from CHOMPStationBot/upstream-merge-11305 
[MIRROR] Janitor Equipment Fix
 2021-08-01 16:07:33 -04:00
Nadyr
aa3c056af6 powder that makes you say yes 2021-08-01 15:11:58 -04:00
Chompstation Bot
0857ab35f3 Few more outdoors fixes 2021-08-01 16:26:38 +00:00
Chompstation Bot
21b6022a3a [MIRROR] Adds optional area-based definition for outdoors-ness 2021-08-01 15:41:46 +00:00
Chompstation Bot
e0900e747c Reworks Shadekin eyecolors (again) 2021-08-01 14:48:52 +00:00
Chompstation Bot
4090222cda Janitor Equipment Fix 2021-08-01 14:45:35 +00:00