Commit Graph

28322 Commits

Author SHA1 Message Date
VerySoft
a4cdc80f8c Stellar delight map files
Files for the stellar delight to work probably
there are also some edits to tether and other misc files for the purpose of making things work with multiple maps
CREMATORIUM NO GET TAG
2021-10-27 19:52:39 -04:00
Casey
a027154001 Merge pull request #11665 from Hatterhat/brrrrped
the part printing buff nobody asked for
2021-10-27 17:55:11 -04:00
Hatterhat
2897b47a11 Merge branch 'master' of https://github.com/VOREStation/VOREStation into brrrrped 2021-10-27 16:43:45 -05:00
klaasjared
56f4ab1b4c Base Commit 2021-10-27 16:18:30 -04:00
Aronai Sieyes
3b5fb11bd1 Merge pull request #11663 from KillianKirilenko/kk-arfg
[WIP] Atmospheric Retention Fields
2021-10-27 14:38:56 -04:00
Aronai Sieyes
a826bcd330 Merge pull request #11712 from KillianKirilenko/kk-misc2
Customverb tweak
2021-10-27 14:17:35 -04:00
PastelPrinceDan
86627bfa9c no conflicts this time please, 2021-10-27 18:27:30 +01:00
Casey
957bc91e5d Merge pull request #11707 from Hatterhat/violence
adds an intent check for the head-targetting pinning message
2021-10-27 13:05:31 -04:00
Hatterhat
2e1b6b3406 THE webedit 2021-10-27 11:47:35 -05:00
Casey
bb830284f5 Merge pull request #11711 from GhostActual/eye_see_you
Eye See You
2021-10-27 12:11:39 -04:00
Casey
2f4cdeeabe Merge pull request #11709 from Very-Soft/shademaneyes
Shadekin eye tweak
2021-10-27 12:10:42 -04:00
Casey
ffabce25b5 Merge pull request #11708 from Hatterhat/drill-buffs
wacky haphazardly barely thought through standing drill buffs
2021-10-27 12:10:19 -04:00
Casey
a84241208d Merge pull request #11706 from GhostActual/dodgeball
Dodgeball+
2021-10-27 12:05:45 -04:00
Casey
72a0e86484 Merge pull request #11705 from GhostActual/brainfood
Brainfood
2021-10-27 12:05:14 -04:00
Casey
226802ff73 Merge pull request #11701 from Hatterhat/tg-ka
ports citrp's KAs, which are a port of citmain's KAs, which are tg's, because i like KAs
2021-10-27 12:00:42 -04:00
Casey
18fa28a431 Merge pull request #11698 from GhostActual/toolz
Tool Time (Fixed)
2021-10-27 11:59:04 -04:00
Casey
2840460a81 Merge pull request #11695 from Verkister/patch-95
Caps item egg size to 100%
2021-10-27 11:48:29 -04:00
Casey
739998e50b Merge pull request #11686 from Very-Soft/hairbs
Make hairs not be offset when using big ears!
2021-10-27 11:45:08 -04:00
Casey
4fa0418e9a Merge pull request #11680 from Heroman3003/stair-sy
Should fix pull stair
2021-10-27 11:41:52 -04:00
Casey
10798ace4c Merge pull request #11673 from PastelPrinceDan/salt
removes 'empty ore box' verb because i'm done with crashes
2021-10-27 11:39:41 -04:00
Casey
e9050833ee Merge pull request #11672 from Verkister/patch-93
Makes trash a valid borg fuel again
2021-10-27 11:39:02 -04:00
Casey
9156979a57 Merge pull request #11671 from VOREStation/upstream-merge-8328
[MIRROR] Rocket launchers make the projectile when they consume the rocket
2021-10-27 11:38:20 -04:00
Casey
7dc1c290c0 Merge pull request #11670 from VOREStation/upstream-merge-8329
[MIRROR] Unequipping mask slot won't disable internals when wearing airtight hats
2021-10-27 11:37:40 -04:00
Casey
d27e53a384 Merge pull request #11664 from Verkister/patch-91
Small organ digestion tweak
2021-10-27 11:32:59 -04:00
Casey
d4da529c2d Merge pull request #11662 from Verkister/patch-90
Fixes taur riding offsets for resize mechanics
2021-10-27 11:32:28 -04:00
Casey
d77990cf41 Merge pull request #11658 from KillianKirilenko/kk-traffic
Traffic Refinements
2021-10-27 11:30:46 -04:00
Casey
648823922e Merge pull request #11657 from VOREStation/upstream-merge-8315
[MIRROR] Rootspeak isn't a RESTRICTED language
2021-10-27 11:28:59 -04:00
Casey
9699a8d35f Merge pull request #11654 from PastelPrinceDan/jacketfix
fixes the retro bomber jacket
2021-10-27 11:28:30 -04:00
Casey
0f65c6f4b3 Merge pull request #11652 from KillianKirilenko/kk-fixes
Medibot Minifix
2021-10-27 11:27:30 -04:00
Casey
058d9e3be3 Merge pull request #11651 from lm40/holocarp
Fixes holodeck carp icons
2021-10-27 11:26:40 -04:00
Casey
8ae704c499 Merge pull request #11649 from lm40/throwing
Throwing fixes
2021-10-27 11:25:34 -04:00
Casey
761ea9892a Merge pull request #11646 from Verkister/patch-89
Fixes microwave disappearing when bloody
2021-10-27 11:25:07 -04:00
Casey
b5317d31e4 Merge pull request #11644 from Verkister/patch-88
Fixes old oxyloss compensation jank
2021-10-27 11:23:42 -04:00
Casey
c1ab2b86de Merge pull request #11643 from Verkister/patch-87
Fixes the language reset bug
2021-10-27 11:22:56 -04:00
Casey
086d348e2f Merge pull request #11642 from PastelPrinceDan/mask
paper masks, emotional mask
2021-10-27 11:22:30 -04:00
Casey
44eb5dd30b Merge pull request #11608 from VOREStation/upstream-merge-8304
[MIRROR] Removes suicide verb function
2021-10-27 11:10:00 -04:00
Killian
d8385d8899 customverb tweak
enforces lowercase for custom verbs
2021-10-27 10:02:00 +01:00
klaasjared
c733a45624 Small Fix 2021-10-27 00:26:46 -04:00
klaasjared
12d668ddb5 Base Commit 2021-10-27 00:17:01 -04:00
VerySoft
4b0934a739 buff event shadekin eyes 2021-10-26 10:28:45 -04:00
Hatterhat
b20e2f818b forgot the indent 2021-10-26 01:09:48 -05:00
Hatterhat
7cfcbdc8b6 i can't pummel in peace 2021-10-26 01:02:48 -05:00
Hatterhat
f7a4a00d85 gorf 2021-10-26 01:00:36 -05:00
klaasjared
a1e855229d Small Fixes 2021-10-25 20:55:48 -04:00
Hatterhat
2655ef17c3 machete resize oops, KA heat modulator 2021-10-25 18:36:45 -05:00
Aronai Sieyes
b9ba661b8b Merge pull request #11603 from VOREStation/upstream-merge-8253
[MIRROR] By-species age restrictions
2021-10-24 20:36:41 -04:00
klaasjared
2d7e85d670 Base Commit 2021-10-24 20:36:00 -04:00
Aronai Sieyes
d89dd0cfd6 Removes suicide verb function 2021-10-24 20:35:36 -04:00
VirgoBot
737c473e4b [MIRROR] :siffet: (#11584)
* :siffet: code

* Siffet suit icon merge

* Fix path

* Fix OTHER path

Co-authored-by: Aronai Sieyes <arokha@arokha.com>
2021-10-24 19:49:05 -04:00
Aronai Sieyes
79f1a263e4 Merge pull request #11083 from Heroman3003/modwl
Adds possibility of borg module whitelisting
2021-10-24 19:48:46 -04:00