Commit Graph
2308 Commits
Author SHA1 Message Date
NadyrandGitHub 7e0df4d4ca Merge branch 'master' into upstream-merge-11065 2021-07-15 19:19:34 -04:00
NadyrandGitHub 951d4b303f Merge pull request #2528 from CHOMPStationBot/upstream-merge-11032
[MIRROR] Add a lot of clothes/armor/suits/spacesuits/rigs
2021-07-15 19:07:37 -04:00
NadyrandGitHub d18c2b5113 powder that makes you say yes 2021-07-15 19:07:21 -04:00
NadyrandGitHub 3765e10954 Merge pull request #2550 from CHOMPStationBot/upstream-merge-11075
[MIRROR] Rearranges vorebelly processing steps to make more sense
2021-07-15 19:01:07 -04:00
NadyrandGitHub 00cbea1f11 Merge pull request #2535 from Verkister/bellyrubbies
Adds bellyrub mechanics
2021-07-15 18:57:19 -04:00
NadyrandGitHub 7dfe7bc71b powder that makes you say yes 2021-07-15 18:47:29 -04:00
Aronai SieyesandChompstation Bot 44167dc84b Merge pull request #11075 from Verkister/unshuffled
Rearranges vorebelly processing steps to make more sense
2021-07-15 18:52:35 +00:00
Chompstation BotandDarlantan b974746755 Add a lot of clothes/armor/suits/spacesuits/rigs 2021-07-14 22:44:11 -04:00
Chompstation Bot 9acb3a208e Removes unnecessary, unused, and redundant helpers. 2021-07-14 17:57:22 +00:00
NadyrandGitHub 5a58add056 Merge pull request #2513 from CHOMPStationBot/upstream-merge-11029
[MIRROR] SmoleWorld micro update
2021-07-13 22:48:22 -04:00
NadyrandGitHub a803e5175f Merge pull request #2493 from CHOMPStationBot/upstream-merge-11002
[MIRROR] Move like every clothing icon file
2021-07-13 22:21:08 -04:00
Verkister 4d27dde687 Adds bellyrub mechanics
Adds a bellyrub verb to manually trigger a belly processing cycle for the target's selected vorgan to help it process its contents faster using a lighter version of the regular belly cycle to avoid straining the subsystem. The bellyrubs can be accessed via an ability tab verb, and can also be easily applied by targeting groin for a hug alternative. This also works on simplemobs and simplemobs can also target groin on help intent to provide rubs.
Also fixes tamed oties smashing through shit that gets in their way.
2021-07-13 19:44:54 +03:00
NadyrandGitHub 26dcca1c0c powder that makes you say yes 2021-07-12 23:44:00 -04:00
Aronai SieyesandChompstation Bot d36eb2c343 Merge pull request #11029 from H0lySquirr3l/master
SmoleWorld micro update
2021-07-12 06:00:20 +00:00
Aronai SieyesandChompstation Bot 27545a7859 Merge pull request #11010 from VOREStation/Arokha/qpadlink
Fix some bugs
2021-07-10 20:12:23 +00:00
Chompstation Bot 16a731dd39 Move like every clothing icon file 2021-07-10 16:23:23 +00:00
NadyrandGitHub 49866902a7 Merge pull request #2479 from CHOMPStationBot/upstream-merge-10980
[MIRROR] Expands do_after/do_mob exclusive var to affect target
2021-07-10 01:30:52 -04:00
NadyrandGitHub e48d0aa61c Merge pull request #2463 from CHOMPStationBot/upstream-merge-10971
[MIRROR] 4 random runtime fixes
2021-07-10 00:00:30 -04:00
NadyrandGitHub 2cad763c26 Merge pull request #2447 from CHOMPStationBot/upstream-merge-10852
[MIRROR] Use material defines more
2021-07-09 23:22:03 -04:00
Aronai SieyesandChompstation Bot f835374f26 Merge pull request #10980 from MarinaGryphon/issue/8289
Expands do_after/do_mob exclusive var to affect target
2021-07-09 16:14:12 +00:00
Chompstation Bot b965d1546c 4 random runtime fixes 2021-07-08 04:54:06 +00:00
NadyrandGitHub 3dc8f881b4 Merge pull request #2457 from CHOMPStationBot/upstream-merge-10956
[MIRROR] Mobs with AI try to stab you when you eat them
2021-07-08 00:00:47 -04:00
NadyrandGitHub 74a5348126 Merge pull request #2449 from CHOMPStationBot/upstream-merge-10945
[MIRROR] 4 fixes
2021-07-07 23:55:47 -04:00
NadyrandGitHub 821ab11478 powder that makes you say yes 2021-07-07 22:51:43 -04:00
NadyrandGitHub 96cde51cbf powder that makes you say yes 2021-07-07 22:21:53 -04:00
Aronai SieyesandChompstation Bot 23b84b3dca Merge pull request #10956 from VOREStation/Arokha/stabby
Mobs with AI try to stab you when you eat them
2021-07-07 23:43:35 +00:00
Aronai SieyesandChompstation Bot afd142bd6a Merge pull request #10945 from VOREStation/Arokha/fixes333
4 fixes
2021-07-07 19:04:22 +00:00
Chompstation Bot 287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Chompstation Bot 6c3930fa81 Vore fixes 2021-07-07 15:50:29 +00:00
Chompstation Bot 14129d60cf Converts visible_message notice spans to look more like emotes 2021-07-05 20:30:12 +00:00
NadyrandGitHub 9ac6347212 Merge pull request #2381 from CHOMPStationBot/upstream-merge-10846
[MIRROR] Make smol holders use vis_contents
2021-07-03 21:19:12 -04:00
NadyrandGitHub 6baa72b9e7 Merge pull request #2367 from CHOMPStationBot/upstream-merge-10819
[MIRROR] Swap some guns for Eris ones
2021-07-03 20:46:52 -04:00
RazgrizandGitHub cd30d4805b Merge pull request #2372 from CHOMPStationBot/upstream-merge-10848
[MIRROR] Increases the character limit on character smell and taste.
2021-07-03 16:54:04 -07:00
Chompstation Bot dc23e61411 Make smol holders use vis_contents 2021-07-03 21:38:55 +00:00
Aronai SieyesandChompstation Bot 533fef05ee Merge pull request #10848 from SpaceVampire/Extend-Flavor
Increases the character limit on character smell and taste.
2021-07-03 21:19:41 +00:00
Aronai SieyesandChompstation Bot bfb7428426 Merge pull request #10819 from VOREStation/Icons/guns
Swap some guns for Eris ones
2021-07-03 21:14:00 +00:00
Aronai SieyesandChompstation Bot 37ddd4f0a6 Merge pull request #10793 from Verkister/patch-63
Adds a missing vore sanity check
2021-07-03 20:18:10 +00:00
Aronai SieyesandChompstation Bot c42b08acc7 Merge pull request #10836 from Verkister/patch-64
Fixes vorepanel content pick menu
2021-07-02 19:01:23 +00:00
NadyrandGitHub d7a16cb514 Merge pull request #2310 from CHOMPStationBot/upstream-merge-10756
[MIRROR] The One Where I Port Modals
2021-07-01 21:30:10 -04:00
NadyrandGitHub e062f13b38 powder that makes you say yes 2021-07-01 20:50:08 -04:00
NadyrandGitHub d466350349 powder that makes you say yes 2021-07-01 20:47:39 -04:00
Chompstation Bot b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Verkister d740d77c8a Reduces vore overlay TGUI payload
Adds a small thumbnail version of the vore overlay dmi with similar iconstates as the real file, and makes the TGUI payload send the information from that file instead of the hugh mungus one to TGUI to avoid killing the vorepanel overlay menu for everyone for the whole round due to some connection hiccup during roundstart preps.
2021-06-30 19:46:04 +03:00
RazgrizandGitHub 93794b2148 Merge pull request #2270 from CHOMPStationBot/upstream-merge-10719
[MIRROR] [MIRROR] Linter diagnostics + bans non-var relative pathing
2021-06-25 00:17:19 -07:00
VerkisterandGitHub 2c56b8b898 Belly overlay fix attempt 2
I can't even reproduce the bug on local anymore but suspecting this part here was what made me try the previous fix in the first place since everything else pre-defined on this list is just singular vars while this part is a proccall for a generated list. Perhaps the old line was still getting to haunt the new sensitive tgui enough to have it randomly override the fixed part but only rngesus knows. Anyway, tested to work fine without the old line here and since I couldn't reproduce the bug anymore, there's a 50% chance it might actually work on live too.
2021-06-24 16:14:17 +03:00
VerkisterandGitHub f3497c5b36 Fixes vorepanel screen overlay menu
Apparently this fixed it even though I have not the faintest clue about how :v
2021-06-24 00:26:34 +03:00
Chompstation Bot fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
NadyrandGitHub 76023710b3 powder that makes you say yes 2021-06-20 14:14:04 -04:00
Chompstation Bot b379b08551 Pandora029 fluff item 2021-06-20 17:40:00 +00:00
RazgrizandGitHub 701c2de162 Merge pull request #2223 from CHOMPStationBot/upstream-merge-10676
[MIRROR] Couple item digestion tweaks.
2021-06-18 19:00:07 -07:00