Commit Graph

12117 Commits

Author SHA1 Message Date
Casey
d75a1ee8ff Merge pull request #12424 from FartMaster69420/borg-vore-hotfix
Borg Vore Hotfix
2022-03-12 15:44:37 -05:00
Casey
2427db9b84 Merge pull request #12420 from FartMaster69420/borg-upgrades
More Upgrade Modules for Borgs
2022-03-12 15:44:14 -05:00
FartMaster69420
9c49ea138e Prevents Accidental Vore
Swaps the order of buttons, making no the default selection.
2022-03-12 15:10:45 -05:00
lbnesquik
c2c4924e56 Implements colored horse tails from @guy 2022-03-12 17:23:19 +01:00
FartMaster69420
2880ded99a Fixing bugs 2022-03-11 22:26:50 -05:00
FartMaster69420
a5a3361799 That didn't work 2022-03-11 22:21:36 -05:00
FartMaster69420
1444a768f3 Mineborg emag gear! 2022-03-11 21:27:40 -05:00
FartMaster69420
c4d09997f7 Printable modules
Making the modules printable
2022-03-11 20:39:56 -05:00
FartMaster69420
1c1d04a9b3 RPED for science 2022-03-11 16:41:44 -05:00
FartMaster69420
35bded46c2 Merge branch 'VOREStation:master' into borg-upgrades 2022-03-11 16:23:30 -05:00
VerySoft
3c63657795 Fix Spacewhale Movement
Now it should actually do what it's supposed to do.
2022-03-11 00:13:44 -05:00
FartMaster69420
e0f7d1e980 Update robot.dm
Allows the eating of and feeding of yourself to borgs. Runs a pref check before giving the player a confirmation window. (A window isn't given to the borg, since prefs already align and there is a timer.)
2022-03-10 22:46:53 -05:00
FartMaster69420
c0565279a5 Update robot.dm
Allows for eating and feeding of borgs
2022-03-10 22:28:14 -05:00
FartMaster69420
94fad3c3c7 Easier Borg Nom
Nom on grab intent
2022-03-10 22:00:57 -05:00
VerySoft
d5c4087450 IT wasn't the final update 2022-03-10 18:56:11 -05:00
VerySoft
7b7a86d9c2 THE FINAL UPDATE 2022-03-10 15:52:58 -05:00
VerySoft
1167ec590b YEAH! 2022-03-10 07:02:00 -05:00
VerySoft
7b029d07b2 Dominant Predator fix
I didn't test it thoroughly enough and so didn't realize it was only searching in the first belly, now it should gather every mob with a ckey in any of your bellies.
2022-03-08 04:07:35 -05:00
VerySoft
970a2022f9 Also stop borgs OOC notes from double posting 2022-03-08 00:14:21 -05:00
Heroman
fbb0a65231 Brings REAL cookies to everywhere they belong 2022-03-07 18:44:53 +10:00
Casey
a58111bcca Merge pull request #12390 from Very-Soft/oocnotesfix
stop double posting ooc notes
2022-03-07 03:29:17 -05:00
VerySoft
a2dd611d4a stop double posting ooc notes
I moved the code to mob/living so more things can have ooc notes and didn't realize it was double posting them when you push the button. This fixes that.
2022-03-07 03:13:22 -05:00
VerySoft
61a3bb8f51 Fix runtime in dominated brain
wow
2022-03-07 02:53:01 -05:00
Casey
095d80a429 Merge pull request #12378 from FartMaster69420/morph-borg
Allowing Morphs to Control Borgs
2022-03-06 22:05:51 -05:00
VerySoft
9fff7e699f THE FINAL UPDATE INCLUDES DOMINANT PREDATORS 2022-03-06 21:51:54 -05:00
VerySoft
0a5e2c811d oops 2022-03-06 15:55:45 -05:00
VerySoft
5867351b69 Add impersonation pref check 2022-03-06 15:52:19 -05:00
VerySoft
5c5a466519 The final update? 2022-03-06 15:44:45 -05:00
FartMaster69420
018958b359 Update morph.dm
Adding comments, removing commented out code.
2022-03-05 16:24:27 -05:00
FartMaster69420
fdd0973bdb Allow control of borgs
This allows morphs to take control over borg characters.
2022-03-05 16:21:37 -05:00
VerySoft
3254a8ab21 quick update 2022-03-05 15:11:06 -05:00
FartMaster69420
c3d2a3591f Borg Stuff 2022-03-05 12:22:03 -05:00
VerySoft
4b6846d69d This is getting out of hand 2022-03-05 03:47:05 -05:00
VerySoft
1b95caa390 [WIP] Dominant Prey
Adds dominant prey to the game.
2022-03-04 16:18:27 -05:00
Verkister
d64d5d4fbc Fixes gibbing deleting all belly contents
Getting tired of watching the looc panic of qdel'd prey flare up over and over again every time a pred gets gibbed in some way or another without anyone ever making issue reports to get the bug fixed :v
2022-03-03 14:06:19 +02:00
Pandora
a22e22b6ef mmm, commits 2022-03-02 15:28:22 +00:00
Casey
125c2c3ce1 Merge pull request #12351 from Very-Soft/itstimetogyoh
It is time to gyoh!
2022-02-28 21:17:09 -05:00
VerySoft
e5b59d4cff It is time to gyoh!
Allows players to gyoh. The sound that plays depends on your size.
2022-02-28 20:39:44 -05:00
Killian
cb6ebb49a9 more allergen tweaks 2022-02-28 04:31:48 +00:00
Casey
245440adb4 Merge pull request #12347 from PastelPrinceDan/zonehair
adds Zone Braid
2022-02-27 15:10:13 -05:00
PastelPrinceDan
5b3cdd3615 zone braid 2022-02-27 19:59:06 +00:00
Casey
4c58c4b275 Merge pull request #12342 from Very-Soft/morphy
Adjust morph transform text
2022-02-27 00:25:16 -05:00
VerySoft
8c1188f477 Adjust morph transform text
Morphs aren't only green now, so let's just make them be piles of flesh instead of piles of green flesh.
2022-02-26 20:46:42 -05:00
FartMaster69420
fc4eb775ec Missed this
Gives service borgs shred limb verbs that other borgs have.
2022-02-26 15:19:12 -05:00
FartMaster69420
8580fa021b Initial Commit
Adds pipe dispensers to pupdozers and engiborgs, adds the circuit gripper to sci-borgs, fixes service borgs not having rider control verbs.
2022-02-26 15:15:06 -05:00
Heroman
f2659cc22c Fixes sect bugs not updating vore glow 2022-02-26 17:42:30 +10:00
VerySoft
2e0a740bf5 Also unabsorb 2022-02-22 16:41:34 -05:00
VerySoft
d6785fc908 Smol morph fix
When taking control of prey, if prey body is muffled, unmuffle them.
2022-02-22 05:22:01 -05:00
Heroman
1af55da1c7 Merge branch 'master' into upstream-merge-8341 2022-02-20 10:15:26 +10:00
Casey
9c7c1d507e Merge pull request #11700 from VOREStation/upstream-merge-8335
[MIRROR] Minor bodytemp warning refactor.
2022-02-19 17:11:49 -05:00