cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-29 10:21:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,085 Commits 8 Branches 26 Tags
0f596e9873d2a6561708b80ed929f110f3a235a2
Commit Graph

27233 Commits

Author SHA1 Message Date
Novacat
0f596e9873 Merge pull request #10486 from VOREStation/upstream-merge-8107 
[MIRROR] Autoinjectors are Autoinjectors
 2021-05-29 14:54:27 -04:00
Atermonera
c4984a57e3 Merge pull request #8107 from Novacat/nova-accessory 
Autoinjectors are Autoinjectors
 2021-05-29 14:40:46 -04:00
Aronai Sieyes
aa7b988e63 VS: Fix final linting errors 2021-05-28 17:45:39 -04:00
Aronai Sieyes
f861dee76f Fix sign in combat unseen 2021-05-28 12:04:43 -04:00
ShadowLarkens
945623170d Actually fix vorepanel 2021-05-27 22:04:21 -07:00
Aronai Sieyes
df1289dbca Fix language sani on relogins 2021-05-27 20:31:50 -04:00
Novacat
827e7e4f8a Merge pull request #10451 from Ketrai/fenneceatsthree 
[HOTFIX] Stop scorpions from crashing the server if you attempt to cook them.
 2021-05-27 18:51:16 -04:00
Ketrai
080c72d703 Changes fried to cooked. 2021-05-28 00:09:52 +02:00
Ketrai
8122869588 Hotfix 
Hotfix
 2021-05-28 00:07:28 +02:00
Aronai Sieyes
e803051975 Merge pull request #10448 from VOREStation/Arokha/shipself9999 
More ship things
 2021-05-27 16:18:29 -04:00
Aronai Sieyes
58367f276a Allow holomaps to be regenerated 2021-05-27 16:06:40 -04:00
Novacat
21658b8d85 Merge pull request #10401 from VOREStation/upstream-merge-8075 
[MIRROR] Reverts recipe changes from Industrial Expansion
 2021-05-27 13:16:06 -04:00
Unknown
b8c1f06675 Finishes this PR 2021-05-27 13:06:41 -04:00
Aronai Sieyes
1226eae2ac Merge branch 'master' into upstream-merge-8098 2021-05-27 12:36:13 -04:00
Aronai Sieyes
b9ad56b022 Merge pull request #10316 from VOREStation/upstream-merge-8071 
[MIRROR] Ports Nebula's Discord Webhook Integration
 2021-05-27 12:34:40 -04:00
Aronai Sieyes
da4837903c Merge pull request #10433 from VOREStation/upstream-merge-8085 
[MIRROR] Linter Introduction + Cleanup
 2021-05-27 12:31:23 -04:00
Aronai Sieyes
61561f0ab3 Merge pull request #10370 from VOREStation/upstream-merge-8087 
[MIRROR] SSpersistence tweaks
 2021-05-27 12:30:12 -04:00
Aronai Sieyes
124eab8aa1 Fixup merge, both VS and nebula hooks now 2021-05-27 12:25:48 -04:00
Aronai Sieyes
b78ca7575a Fix merge of 8087 2021-05-27 12:19:48 -04:00
Aronai Sieyes
28a6962d51 VS: One more disambig 2021-05-27 12:10:30 -04:00
Aronai Sieyes
27b9451181 VS: Kwargs fixes 2021-05-27 12:10:22 -04:00
Aronai Sieyes
3ee63e782a VS: Ambig OoO 2021-05-27 12:09:38 -04:00
Aronai Sieyes
7d725e740b VS: Implicit list abuse 2021-05-27 12:08:51 -04:00
Aronai Sieyes
4cfdd72c02 VS: Strange incorrect code times 2021-05-27 12:07:41 -04:00
Aronai Sieyes
0c954142d2 VS: Times /list was used wrong 2021-05-27 12:05:00 -04:00
Aronai Sieyes
00a42a96ea Finish polaris linter portions 2021-05-27 11:12:51 -04:00
Novacat
979154a4ef Merge pull request #10443 from Very-Soft/moarfakesuncolors 
Adds more fake sun colors
 2021-05-27 10:09:56 -04:00
Aronai Sieyes
10c0942233 Remove unused var 2021-05-27 09:37:07 -04:00
VerySoft
231c5750f8 Adds more fake sun colors 
Adds several colors and brightnesses that the lighting can be
 2021-05-27 04:59:09 -04:00
Novacat
2984fa7104 Merge pull request #10422 from VOREStation/Arokha/fakesun 
Adds a fake sun object for mapper usage
 2021-05-26 21:09:45 -04:00
Aronai Sieyes
eb9de2cb7c Merge pull request #10411 from VOREStation/Arokha/aro3 
Aro shipself v3
 2021-05-26 21:09:34 -04:00
Aronai Sieyes
f0a06e19fa Merge pull request #10432 from Very-Soft/ionengineuwu 
New Ion engine sprite
 2021-05-26 21:09:22 -04:00
Aronai Sieyes
4f040b5e15 Merge pull request #10434 from VOREStation/Arokha/forget 
AI bugfixes
 2021-05-26 21:09:03 -04:00
VerySoft
cff66ff11a also fixes some other emotes 2021-05-26 00:43:33 -04:00
VerySoft
208aa3d39c Seperates chirp and teshchirp 
Teshchirp was overriding chirp for non tesh and me no like so tesh chirp is tchirp now
 2021-05-26 00:31:50 -04:00
Aronai Sieyes
305ba023ea So picky a lynx 2021-05-26 00:19:43 -04:00
Aronai Sieyes
b00effff0d Tweak or break AI 2021-05-26 00:17:56 -04:00
Aronai Sieyes
42f624367f Make woofs forgetful 2021-05-26 00:17:16 -04:00
Aronai Sieyes
8b6742fbb1 Make nurse spiders forget target 2021-05-26 00:15:35 -04:00
Novacat
d52621ab52 Update ai_container.dm 2021-05-25 23:26:04 -04:00
Novacat
408b0f366d Update spreading.dm 2021-05-25 23:25:28 -04:00
Novacat
726c90fac9 Update escape_pods.dm 2021-05-25 23:22:40 -04:00
Neerti
767e655310 Linter Introduction + Cleanup 2021-05-25 23:19:34 -04:00
VerySoft
7a029e0ee9 New Ion engine sprite 
UWU
 2021-05-25 22:42:19 -04:00
Aronai Sieyes
535519ad32 Allow mapped-in graffiti 2021-05-25 22:28:30 -04:00
Aronai Sieyes
bdd4c3c973 Add secret zlevels 2021-05-25 21:24:12 -04:00
Novacat
e963ad761f Merge pull request #10425 from Heroman3003/pipefix2 
Fixes proteans being a bit too liberal with reformation
 2021-05-25 18:53:48 -04:00
Heroman
be41b14f9a Fixes proteans being a bit too liberal with reformation 2021-05-26 07:56:42 +10:00
Novacat
21836a3485 Merge pull request #10408 from VOREStation/Arokha/spaceoddity 
Maybe make deepspace levels slightly more robust?
 2021-05-25 17:32:03 -04:00
Aronai Sieyes
d9c57e953b Add fake sun object for map stuff 2021-05-25 16:52:38 -04:00