Commit Graph

13113 Commits

Author SHA1 Message Date
Nadyr
680cffa88a Merge pull request #3211 from CHOMPStation2/upstream-merge-11928
[MIRROR] Offmap Tweaks
2021-12-05 14:04:20 -05:00
Nadyr
bbaa6d52e2 Merge pull request #3207 from CHOMPStation2/upstream-merge-11922
[MIRROR] Swaps Yes and No for give popup
2021-12-05 13:40:24 -05:00
Nadyr
23384ac5f3 powder that makes you say yes 2021-12-05 13:39:54 -05:00
Nadyr
f34728bca2 Merge pull request #3212 from CHOMPStation2/upstream-merge-11937
[MIRROR] Adds updated "Tall" Cyborg Variants
2021-12-05 13:29:32 -05:00
Nadyr
e895ee197c Merge pull request #3214 from CHOMPStation2/upstream-merge-11926
[MIRROR] Adds Jackalope ears and antlers
2021-12-05 13:28:58 -05:00
Nadyr
b2e74aefae Merge pull request #3215 from CHOMPStation2/upstream-merge-11924
[MIRROR] Adds more equip slots for monkey hud
2021-12-05 13:28:48 -05:00
Nadyr
db3ef9440e Merge pull request #3217 from CHOMPStation2/upstream-merge-11921
[MIRROR] Snakes are Sweet
2021-12-05 13:28:39 -05:00
Nadyr
bccbb786a7 Merge pull request #3220 from CHOMPStation2/upstream-merge-11917
[MIRROR] Fixes simplemobs appearing misleadingly starved
2021-12-05 13:09:59 -05:00
Nadyr
8e779b4d64 Merge pull request #3221 from CHOMPStation2/upstream-merge-11912
[MIRROR] Simplifies butchering
2021-12-05 13:09:16 -05:00
Nadyr
1e8a2d5ef0 Merge pull request #3206 from TheGreatKitsune/medihound-extra-modules
Add some missing modules to the medihound
2021-12-05 13:08:58 -05:00
Nadyr
12fcd16528 powder that makes you say yes 2021-12-05 13:01:38 -05:00
Nadyr
1dc06fd9e6 Merge branch 'master' into upstream-merge-11928 2021-12-05 12:50:21 -05:00
Nadyr
ea10e52abb Merge pull request #3224 from CHOMPStation2/upstream-merge-11933
[MIRROR] Fixes prefs of simple bots allowing vore despite mob itself not allowing it.
2021-12-05 12:39:52 -05:00
Nadyr
e101e1edc4 Merge pull request #3225 from CHOMPStation2/upstream-merge-11938
[MIRROR] Fixes bad 0th law in rare lost drone case
2021-12-05 12:39:32 -05:00
Nadyr
2f0a060a35 powder that makes you say yes 2021-12-05 12:36:47 -05:00
Nadyr
0fd8caed89 powder that makes you say yes 2021-12-05 12:33:31 -05:00
Nadyr
a55034a2a0 Merge pull request #3229 from CHOMPStation2/upstream-merge-11911
[MIRROR] Mob tweaks
2021-12-05 12:26:07 -05:00
Nadyr
b5cb7fc2fb Merge pull request #3230 from CHOMPStation2/upstream-merge-11882
[MIRROR] Fixes mobs dying twice on gib
2021-12-05 12:24:05 -05:00
Nadyr
ce08987156 Merge pull request #3245 from CHOMPStation2/upstream-merge-11892
[MIRROR] Allows Shadekin to use beards
2021-12-05 10:55:30 -05:00
Nadyr
a98f027c97 Merge pull request #3248 from CHOMPStation2/upstream-merge-11889
[MIRROR] Mice are Nice
2021-12-05 10:21:55 -05:00
Nadyr
b60ece91ea powder that makes you say yes 2021-12-05 10:16:34 -05:00
Nadyr
424e31fa41 powder that makes you say yes 2021-12-05 09:58:18 -05:00
Nadyr
ca9b296d14 powder that makes you say yes 2021-12-05 09:49:55 -05:00
Nadyr
e31c38a372 powder that makes you say yes 2021-12-05 09:43:20 -05:00
Nadyr
10b2c20ed3 powder that makes you say yes 2021-12-05 09:33:44 -05:00
Nadyr
0598f69d6c powder that makes you say yes 2021-12-05 09:21:34 -05:00
Casey
1cf74ee92a Merge pull request #11882 from Heroman3003/broodmotherfix
Fixes mobs dying twice on gib
2021-12-03 07:17:50 +00:00
Casey
aee018a27b Mob tweaks 2021-12-03 07:17:35 +00:00
Aronai Sieyes
7fd5500f16 Merge pull request #11938 from Heroman3003/lawfix
Fixes bad 0th law in rare lost drone case
2021-12-03 07:16:42 +00:00
Aronai Sieyes
1c228a7d82 Merge pull request #11933 from Heroman3003/botprefs
Fixes prefs of simple bots allowing vore despite mob itself not allowing it.
2021-12-03 07:16:34 +00:00
Casey
12cc72e439 Simplifies butchering 2021-12-03 07:16:04 +00:00
Casey
af4825cf84 Merge pull request #11917 from Verkister/patch-101
Fixes simplemobs appearing misleadingly starved
2021-12-03 07:15:52 +00:00
Casey
a1fabbfaa1 Snakes are Sweet 2021-12-03 07:15:09 +00:00
Casey
c7af715672 Merge pull request #11924 from Verkister/patch-104
Adds more equip slots for monkey hud
2021-12-03 07:14:49 +00:00
Casey
db95a197f1 Merge pull request #11926 from Heroman3003/jackalope
Adds Jackalope ears and antlers
2021-12-03 07:14:42 +00:00
Casey
2eb88a6be0 Merge pull request #11937 from ShadeAware/robo-update
Adds updated "Tall" Cyborg Variants
2021-12-03 07:14:28 +00:00
Casey
fe8c4753eb Offmap Tweaks 2021-12-03 07:14:17 +00:00
Casey
9021076104 Swaps Yes and No for give popup 2021-12-03 07:12:39 +00:00
TheGreatKitsune
5ce2094d88 Add some more modules to the medihound 2021-12-02 13:08:16 -06:00
BlackMajor
c323ab01cd whoops, forgot to get rid of a debugging message 2021-11-25 20:52:01 +13:00
BlackMajor
876276f817 reverse vorespawn 2021-11-25 19:49:28 +13:00
Verkister
08624edf84 Earlyports some holder tweaks
Moves the part of the code handling the holder things on scooped up snacking to where the actual snacking happens, and also clears and deletes the holder afterward.
Also contains checks to make sure any undeclared stowaways in holder contents also get eaten (or dumped on the ground if that somehow fails) instead of getting deleted with the holder. Probably fixes a lag or garbage collection jank bug that sometimes makes the holder dump the prey back on ground after they've already been eaten, and also fixes the thing with the holder item still lingering in hand for the entire process cycle duration after the prey has already been eaten.
Also makes holders use Entered/Exited to do their things with the contained mob to make them function more reliably. (now makes sure only one mob can enter a holder, and now also clears the held_mob var and returns the held mob's transform appearance back to the mob without requiring the ground dump proc, which probably also fixes the thing with eaten held mobs sometimes getting released with messed up scaling etc)
Tested working nicely.
2021-11-22 22:18:32 +02:00
radiantAurora
dd6cfb293f Update life.dm 2021-11-20 14:32:55 +00:00
radiantAurora
5427358e0f Update life.dm 2021-11-20 14:31:43 +00:00
Verkister
b91a0cca4f Earlyports fix for hungry simplemob runtime spam
Fixes runtime spam caused by simplemobs with initial nutrition value of 0.
2021-11-12 15:39:08 +02:00
Verkister
c18e8b7520 Adjusts nutrition shrink trait trigger threshold
Moved from "barely peckish" to "starving"
2021-11-03 18:09:36 +02:00
Chompstation Bot
60de9a473c Stellar Delight! 2021-10-30 13:34:04 +00:00
Aronai Sieyes
a88d7a0f69 Merge pull request #11720 from VOREStation/Arokha/verupdate
Update version guidance
2021-10-28 01:47:45 +00:00
Aronai Sieyes
12d8d8f592 Merge pull request #11681 from VOREStation/upstream-merge-8326
[MIRROR] You can't feed drinks to borgs
2021-10-28 01:25:13 +00:00
Nadyr
ad32a18c7a powder that makes you say yes 2021-10-27 21:12:52 -04:00