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
65,129 Commits 8 Branches 26 Tags
9cc78d72cc7deeef56041c7e3d2faaf63d07a481
Commit Graph

30836 Commits

Author SHA1 Message Date
Heroman3003
9cc78d72cc Merge pull request #14493 from Yatiyaya/Voxxy-Clothing 
Voxxy clothing
 2023-02-18 04:41:01 +10:00
Heroman3003
e0d6445a02 Merge pull request #14478 from ItsSelis/patch-6 
Adds Href Token to database banning forms
 2023-02-18 04:40:46 +10:00
JoltDerg
4ce47b8a8e adds the alien slug ears and tail 2023-02-16 17:29:28 +00:00
Bangus
cd3ecaa8c1 Unwhitelisted 2023-02-14 20:31:04 -05:00
Novacat
d4c14d66b5 Merge pull request #14488 from Runa-Dacino/helpfultips_typofix 
Fixes player tips becoming spammy past 75 minutes
 2023-02-13 11:31:13 -05:00
Runa Dacino
dc707da41d Fixes player tips becoming spammy past 75 minutes 2023-02-13 11:47:54 +01:00
Casey
f29488db44 Merge pull request #14482 from Runa-Dacino/helpfultips_typofix 
Changes VORESTation to Vorestation in player_tips_list
 2023-02-12 17:10:45 -05:00
Casey
f6f5051d17 Revert "Runtime fixes" 2023-02-12 16:57:05 -05:00
Runa Dacino
56ab5ec7da Typo fixes 2023-02-12 22:17:33 +01:00
Casey
74b43ab205 Merge pull request #14477 from Seris02/proteandefaultfix 
fix default proteans being technically organic shift start
 2023-02-12 13:20:48 -05:00
Casey
b9ac0bfe51 Merge pull request #14476 from Heroman3003/runtime-17 
Runtime fixes
 2023-02-12 13:20:23 -05:00
Casey
31d66d66c2 Merge pull request #14475 from Heroman3003/b-e-a-n 
Makes muffins not have beans in them
 2023-02-12 13:20:10 -05:00
Casey
5d2045f712 Merge pull request #14472 from Seris02/traitprefs2 
adds trait preferences and removes a bug
 2023-02-12 13:19:52 -05:00
Casey
d260f6be19 Merge pull request #14456 from Runa-Dacino/HelpfulTips 
Implements periodic tips for (new) players!
 2023-02-12 13:18:41 -05:00
Selis
9552d54f90 Adds Href Token to database banning forms 2023-02-12 12:38:29 +01:00
Seris02
2917b0f571 fix default proteans being technically organic shift start 2023-02-12 14:38:41 +08:00
Heroman
0129bcd422 Runtime fixes 2023-02-12 12:35:44 +10:00
Heroman
1809eba069 Makes muffins not have beans in them 2023-02-12 09:49:22 +10:00
Bangus
715c07e95e Marking system now respects me, unlike dad 2023-02-11 17:41:12 -05:00
Novacat
8be06b127b Merge pull request #14474 from VOREStation/Staff-Viewing_Patch 
Removes R_STEALTH perm requirement for staff chats
 2023-02-11 16:46:01 -05:00
C.L
5ddab5e959 Removes ability for Retired Admins to see staff chats. 
Does exactly what it says on the tin.
 2023-02-11 13:47:23 -05:00
Burrito Justice
e47b9a3315 fix file conflicts 2023-02-10 08:37:56 -08:00
Runa Dacino
d05029a1cd Implements opt-out system of periodic tips to be sent to players 2023-02-10 14:34:31 +01:00
Seris02
8f0e606ced woops 2023-02-10 19:18:40 +08:00
Seris02
b117afd9eb adds trait preferences and removes a bug 2023-02-10 18:27:46 +08:00
Burrito Justice
ae76c2a4fe wtf is a site director 2023-02-09 23:29:41 -08:00
Burrito Justice
6b6ecad162 new drip mf 2023-02-09 23:10:44 -08:00
Seris02
3cec940418 more tesh coats and non tesh coats too 2023-02-10 09:05:11 +08:00
Seris02
0e90fa837d Merge branch 'master' of https://github.com/VOREStation/VOREStation into teshbranch 2023-02-09 21:20:31 +08:00
Seris02
c72f1e86a7 tesh wintercoats part one 2023-02-09 21:20:17 +08:00
Bangus
083d9ba2f6 Bunch'a fixes and changes 2023-02-08 17:20:59 -05:00
VerySoft
dda5b866cb Succlet adjust 2023-02-08 14:34:51 -05:00
Heroman3003
09c9b0e967 Merge pull request #14465 from ItsSelis/master 
Admin href fax topic thing fix
 2023-02-08 13:13:27 +10:00
Heroman3003
ae50289441 Merge pull request #14446 from Hatterhat/outfit-pass2 
skyrat outfit port continuation (adds to loadout)
 2023-02-08 13:13:13 +10:00
Hatterhat
83cbaa3754 merely an issue of skill 2023-02-07 16:42:26 -06:00
Hatterhat
9176d32723 dinglestry baby 2023-02-07 15:42:55 -06:00
Heroman
ded88f15bf Hopefully fixes croaked codebase 2023-02-08 07:22:25 +10:00
ItsSelis
1331815606 Admin href fax topic thing fix 2023-02-07 22:14:20 +01:00
Casey
c5a7f70798 Merge pull request #14459 from Seris02/coldheatruntimefix 
proper sanitization of cold and heat messages
 2023-02-07 14:00:18 -05:00
Seris02
d8f4997230 proper sanitization of cold and heat messages 2023-02-08 01:04:44 +08:00
VerySoft
7102ef1dcc succlet 2023-02-07 11:35:01 -05:00
VerySoft
73e223c18f succlet 2023-02-07 10:54:27 -05:00
VerySoft
81d12687c6 Succlet 
Succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet succlet
 2023-02-07 02:57:35 -05:00
Seris02
254aaeaee0 Merge branch 'master' of https://github.com/VOREStation/VOREStation into nanoformfixwoops 2023-02-06 17:05:24 +08:00
Seris02
41ef1b7fd2 fixes child organs robotizing again afterwards - only for nanoform organs 2023-02-06 15:57:16 +08:00
Heroman3003
6db2420b96 Merge pull request #14449 from VOREStation/upstream-merge-8927 
[MIRROR] Child organs can't robotize() if they're already robotic
 2023-02-06 16:56:58 +10:00
Heroman3003
92930ff501 Merge pull request #14445 from Seris02/tablewalkfix 
makes it so you can't walk on small people when you shouldn't
 2023-02-06 16:55:59 +10:00
Spookerton
022a4c3a89 Merge pull request #8927 from Atermonera/fix_robotize_order 
Child organs can't robotize() if they're already robotic
 2023-02-05 10:10:06 -05:00
Hatterhat
9959052c03 blunder (classic) 2023-02-05 04:28:28 -06:00
Seris02
66dc3ce176 better code 2023-02-05 18:28:22 +08:00