cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-05 22:00:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
64,386 Commits 8 Branches 26 Tags
f75ac40407dee9486efd46e21db9f20c5df26f5b
Commit Graph

64386 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Casey
f75ac40407 Merge pull request #14038 from TheDavestDave/rocks-not-fossils 
remove xenoarch tools from mining vender
 2022-11-06 12:12:58 -05:00
Casey
318629da8e Merge pull request #14037 from ItsSelis/patch-6 
Fixes ahelp fullmonty runtime
 2022-11-06 12:12:50 -05:00
Casey
cd646529cd Merge pull request #14034 from Heroman3003/podfix 
Blocks creation of shelter pods in the Fish Farm and Public Garden
 2022-11-06 12:12:36 -05:00
Casey
4f83622cc6 Merge pull request #14033 from Heroman3003/axe-the-axe 
Axes the axes
 2022-11-06 12:12:17 -05:00
Casey
348d08d914 Merge pull request #14028 from KillianKirilenko/kk-allergies 
Allergen Effect/Reaction Traits
 2022-11-06 11:57:54 -05:00
Casey
7318badc17 Merge pull request #14024 from VOREStation/dependabot/npm_and_yarn/tgui/xmldom/xmldom-0.7.8 
Bump @xmldom/xmldom from 0.7.5 to 0.7.8 in /tgui
 2022-11-06 11:57:31 -05:00
Casey
ad9ed2b7a7 Merge pull request #14027 from KillianKirilenko/on-mob-examine 
On mob examine
 2022-11-06 11:57:22 -05:00
Casey
ec81deaac6 Merge pull request #14025 from Heroman3003/newplayer-fixes 
Fixes two lobby bugs
 2022-11-06 11:56:09 -05:00
Casey
08205eb307 Merge pull request #14023 from Heroman3003/fix-mark 
Removes crab claws, fixes belly tattoo
 2022-11-06 11:56:00 -05:00
Casey
006621e178 Merge pull request #14022 from Heroman3003/sidona-wl 
Allows Sidona to use Perrin's tail and robes
 2022-11-06 11:55:49 -05:00
Casey
e2d556b114 Merge pull request #14021 from KillianKirilenko/kk-lanyard 
Baton Lanyard
 2022-11-06 11:55:34 -05:00
Casey
5013e443e9 Merge pull request #14018 from BonniePandora/Text-box-QoL-stuff 
Various text-box QoL stuff
 2022-11-06 11:54:58 -05:00
Casey
3c4ab7642d Merge pull request #14017 from KillianKirilenko/kk-linebreak 
Permit (Some) Linebreaks
 2022-11-06 11:54:42 -05:00
TheDavestDave
353342fb10 remove xenoarch tools from mining vender 
Seems odd to give a reward items that can only be used for job stealing
 2022-11-05 14:31:45 +00:00
Selis
4d89cfa28f Update adminhelp.dm 2022-11-05 11:03:18 +01:00
Heroman
ca4d72b34a Removes all cabinets instead of making functional ones spawn empty 2022-11-05 16:17:05 +10:00
Heroman
a50370a6ec Also excludes landing areas on Tether and RP 2022-11-05 16:08:36 +10:00
Heroman
afd746356c Blocks creation of shelter pods in the Fish Farm and Public Garden 2022-11-05 08:24:09 +10:00
Heroman
1957fca543 Axes the axes 2022-11-05 08:22:28 +10:00
Killian
4b988e717c Update neutral.dm 2022-11-03 05:41:22 +00:00
Killian
690b70c955 allergen effect traits 2022-11-03 03:54:29 +00:00
Killian
fd089d28c0 restore a couple of virgotweaks 2022-11-02 04:52:21 +00:00
Killian
624c6a4333 Update examine.dm 2022-11-02 04:37:22 +00:00
Heroman
e646742887 Fixes two lobby bugs 2022-11-02 05:32:57 +10:00
dependabot[bot]
3d62ec88f8 Bump @xmldom/xmldom from 0.7.5 to 0.7.8 in /tgui 
Bumps [@xmldom/xmldom](https://github.com/xmldom/xmldom) from 0.7.5 to 0.7.8.
- [Release notes](https://github.com/xmldom/xmldom/releases)
- [Changelog](https://github.com/xmldom/xmldom/blob/master/CHANGELOG.md)
- [Commits](https://github.com/xmldom/xmldom/compare/0.7.5...0.7.8)

---
updated-dependencies:
- dependency-name: "@xmldom/xmldom"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-01 19:23:38 +00:00
Heroman
8e51e98ebf Removes crab claws, fixes belly tattoo 2022-11-02 04:47:19 +10:00
Heroman
ecc0168ec1 Allows Sidona to use Perrin's tail and robes 2022-11-02 04:36:14 +10:00
Killian
0dcf8a434a baton lanyard 2022-10-31 13:05:28 +00:00
Pandora
76ec604848 Update 13_soulcatcher.dm 2022-10-31 03:09:55 +00:00
Pandora
abfa817226 Update say_vr.dm 
Removes psay's "none" button, makes narrate & pme into multiline boxes & removes their "none" buttons too
 2022-10-31 03:00:35 +00:00
Killian
558811398f Update text.dm 2022-10-31 01:19:58 +00:00
Casey
3bb5cefe6e Merge pull request #14015 from Very-Soft/backtotether 
back to tether
 2022-10-30 11:33:56 -04:00
Casey
27df5d2e2c Merge pull request #14012 from KillianKirilenko/kk-woerm 
Wormborgs
 2022-10-30 11:28:02 -04:00
Casey
54b6e02588 Merge pull request #14014 from Heroman3003/markings-wings 
Adds arm-wings wings and crab claws marking
 2022-10-30 11:26:51 -04:00
Casey
08b20180be Merge pull request #14013 from Very-Soft/playernarrate 
Player Narrate
 2022-10-30 11:26:40 -04:00
Casey
5ca4544a7a Merge pull request #14010 from Heroman3003/flight-xeno-fix 
Fixes xenochimera flight not having restrictions
 2022-10-30 11:25:40 -04:00
Casey
b6d98092ac Merge pull request #14009 from Heroman3003/material-runtime 
Fixes inserting sheets with no defined material (like tiles) into machines
 2022-10-30 11:25:23 -04:00
VerySoft
fc546e44d9 back to tether 2022-10-30 11:23:49 -04:00
Killian
74b0f08158 security and combat worm tweaks 
made security worms red rather than hot pink, made seperate combat worm, added shield fx for combat worm, hot pink worm sprite left in the files
 2022-10-30 15:18:13 +00:00
VerySoft
49fd60ab93 no unconscious narrates 2022-10-30 04:52:18 -04:00
Heroman
6063f11796 Adds crab claw markings 2022-10-30 18:13:40 +10:00
Heroman
e0066a2f8b Adds armwings 2022-10-30 18:10:27 +10:00
VerySoft
3f172b130b Player Narrate 
Something I've wanted for a good while, the ability to make posts that aren't directly emotes, or emotes that don't start with one's name! 

This should allow you to do your "It was a dark and stormy night" kind of posts if you should so desire.
 2022-10-30 04:09:16 -04:00
Heroman3003
701b1b859d Merge pull request #14011 from TankTheBirb/tesh-beak-2 
Tesh beak addition part 2: resolving conflicts
 2022-10-30 18:07:55 +10:00
Killian
8e3ec41ad7 worm off the string 
what sins will he commit
 2022-10-30 00:09:16 +01:00
TankTheBirb
91926d8363 Tesh beak addition part 2: resolving conflicts 
Like the previous PR it adds tesh beaks. Pointy and round. Its not too wild. I do tails another day in a different PR.
 2022-10-29 16:49:22 -04:00
Heroman
cf704c9c7b Typo fix 2022-10-30 05:49:49 +10:00
Heroman
eb124096d4 Fixes xenochimera flight not having restrictions 2022-10-30 05:44:52 +10:00
Heroman
f6d78e4ccf Fixes inserting sheets with no defined material (like tiles) into machines 2022-10-30 05:39:20 +10:00
Heroman3003
66623a564b Merge pull request #14006 from VOREStation/revert-13977-upstream-merge-8784 
Revert "[MIRROR] Nudges sif's resting temperature"
 2022-10-29 17:45:59 +10:00