Commit Graph

30814 Commits

Author SHA1 Message Date
Runa Dacino fff4e9ffc5 Implements new machine that creates autoinjectors en masse 2023-02-12 21:03:07 +01: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
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
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
Hatterhat 29004983ea works on my machine 2023-02-05 04:22:55 -06:00
Seris02 31ac8c085f you can no longer walk on mobs that you aren't supposed to be able to walk on 2023-02-05 14:35:00 +08:00
Heroman3003 909c382e4e Merge pull request #14443 from Cyantime/patch-2
Fixes "Colored Feminine Jumpsuit"
2023-02-05 13:56:56 +10:00
Heroman3003 92f9c3e37f Merge pull request #14410 from Cyantime/filemanager
Fixes #14173, other modular computer file manager improvements
2023-02-05 13:56:38 +10:00
Novacat 123a8c419b Merge pull request #14442 from Heroman3003/faintfix
Fixes mobs falling asleep when fainting
2023-02-04 22:15:21 -05:00
Cyantime 4980fc6f5f Fixes an incorrect path 2023-02-04 21:53:03 -05:00
Heroman 51515caf19 Fixes mobs falling asleep when fainting 2023-02-05 12:16:17 +10:00
Heroman 7f76589320 Adjusts message sending condition 2023-02-05 11:30:34 +10:00
Heroman e5de0af979 Some runtime fixes 2023-02-05 11:28:57 +10:00
Heroman ef3769136b Small typing fix 2023-02-05 09:39:05 +10:00
Heroman3003 7c14ead771 Merge pull request #14439 from Heroman3003/post-mirror-fixes
Some post-mirror fixes
2023-02-05 07:51:47 +10:00
Heroman3003 4aa23a5874 Merge pull request #14430 from VOREStation/upstream-merge-8905
[MIRROR] Removes unused mecha damage absorbtion list.
2023-02-05 07:48:05 +10:00
Heroman 0015526a7a Some post-mirror fixes 2023-02-05 07:41:18 +10:00
Heroman3003 fadbf5b9a9 Merge pull request #14434 from VOREStation/upstream-merge-8914
[MIRROR] Adds a proc to fix player notes listings
2023-02-05 07:23:09 +10:00
Heroman3003 39d0823f95 Merge pull request #14431 from VOREStation/upstream-merge-8911
[MIRROR] fixes robo limbs setting child limbs afterwards
2023-02-05 07:03:56 +10:00
Heroman3003 15046b0a89 Merge pull request #14432 from VOREStation/upstream-merge-8918
[MIRROR] Ports Aurora Skrell emotes + fixes warble emote
2023-02-05 07:02:53 +10:00
Spookerton e88b875cd5 Adds a proc to fix player notes listings 2023-02-04 15:37:44 -05:00
Spookerton 16d76bdb96 Merge pull request #8918 from listerla/warble
Ports Aurora Skrell emotes + fixes warble emote
2023-02-04 15:35:28 -05:00
Spookerton d393ca3a8c Merge pull request #8911 from Seris02/robolimbsfix
fixes robo limbs setting child limbs afterwards
2023-02-04 15:35:22 -05:00
Spookerton 68022d927c Removes unused mecha damage absorbtion list. 2023-02-04 15:33:13 -05:00
Spookerton c5e353fab7 Merge pull request #8915 from Seris02/letmeCLEAN
allows soap and showers to clean toes, and space cleaner to actually clean synthetic toes
2023-02-04 15:31:56 -05:00
Casey 38c6ae714a Merge pull request #14419 from Heroman3003/send-help-brad-and-duke-are-holding-me-hostage-and-making-me-code-stuffing-features
Adds Food Stuffer trait
2023-02-04 00:37:09 -05:00