Commit Graph

28957 Commits

Author SHA1 Message Date
Pandora
265d268c19 I wouldn't know how to land it 2022-03-13 07:38:21 +00:00
VerySoft
2eae95c4e7 Allow borgs to interact with tether and SD mining shuttles
Overlooked these!
2022-03-13 00:38:00 -04:00
Casey
068b74861a Merge pull request #12426 from Very-Soft/refixitemstats
Re-fix item digestion vore stat count
2022-03-12 16:04:36 -05:00
Casey
20d1af39d3 Merge pull request #12425 from Very-Soft/Borgandshuttletweak
AI/Borgs and Shuttles
2022-03-12 15:59:40 -05:00
VerySoft
c4583bb47a Re-fix item digestion vore stat count
It didn't take last time it seems. :O
2022-03-12 15:53:08 -05:00
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
VerySoft
e01b2d8313 AI/Borgs and Shuttles
Replaces the tourbus SMES with the appropriate kind

Also, prevents AI/Borgs from accessing shortjump consoles on OM capable ships and helm consoles. 

In general, borgs should not be leaving the station to go fly around without crew there. And it's happened a number of times, that AI will get involved in ship operations if they have any camera they can see anywhere in there, even when the ship is far away, and in general I have never been a fan of AI piloting ships. (And they couldn't really do so very well anyway since they couldn't access the map.)

So! Now short jump consoles and helm control consoles require a person to fly, unless otherwise configured to allow it.
2022-03-12 15:39:58 -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
Casey
c25134afb3 Merge pull request #12423 from lbnesquik/master
Implements colored horse tails from @guy
2022-03-12 12:30:00 -05:00
lbnesquik
c2c4924e56 Implements colored horse tails from @guy 2022-03-12 17:23:19 +01:00
GhostActual
e27ab0c103 Base Commit 2022-03-12 01:05:30 -05: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
Casey
0d50491322 Merge pull request #12416 from FartMaster69420/borg-grab-ez
Borg Prey and Borg Feeding
2022-03-11 00:03:49 -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
GhostActual
0ba03aaf09 Base Commit 2022-03-10 22:18:06 -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
Verkister
7024659a3d Fixes item digestion vore stat count
Makes the stat count the things when the item is actually digested instead of counting every tick of partial digestion that may have affected it.
2022-03-10 08:54:29 +02:00
VerySoft
f44aa8adbf Vore Stats
Adds some vore stats to the end of round trivia thing. 

Includes number of times any mob with a ckey was eaten, digested, or absorbed.

Also includes number of items digested.
2022-03-09 17:31:02 -05:00
Pandora
4702afc7c7 This is why you double-check your code kids
because I'm a potato
2022-03-09 16:20:42 +00:00
Pandora
f040197ce7 'Do I feel lucky?' Well, do ya, punk? 2022-03-09 16:11:23 +00:00
Pandora
91158267e9 but there is no real me 2022-03-09 05:31:43 +00:00
Pandora
0358d02df6 smol fix 2022-03-08 11:29:58 +00:00
Heroman
b6ad70799a Fixes weird char setup crash 2022-03-08 20:44:50 +10: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
Casey
a85cd666a6 Merge pull request #12392 from Heroman3003/cookiefix
Brings REAL cookies to everywhere they belong
2022-03-07 04:05:16 -05:00
Heroman
fbb0a65231 Brings REAL cookies to everywhere they belong 2022-03-07 18:44:53 +10:00
Casey
0eaef3bbf0 Merge pull request #12382 from BonniePandora/Atmosia-Improvements
Minor Atmos-tech QoL & new hazard vest
2022-03-07 03:35:18 -05:00
Casey
a58111bcca Merge pull request #12390 from Very-Soft/oocnotesfix
stop double posting ooc notes
2022-03-07 03:29:17 -05:00
Casey
6853d0960d Merge pull request #12388 from GhostActual/Recipe-fix
Recipe Fixes
2022-03-07 03:17:28 -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
GhostActual
b53e4fe7c9 Base Commit 2022-03-07 01:52:24 -05:00
Casey
16db0b9784 Merge pull request #12380 from Hatterhat/rig-undersuits
undersuits for EVA equipment enthusiasts
2022-03-06 22:08:08 -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
Casey
71c70faeee Merge pull request #12375 from GhostActual/vaporwave-dreams
Vaporwave Dreams
2022-03-06 22:05:20 -05:00
Casey
298774524c Merge pull request #12368 from Heroman3003/event-min-jobs
Adds minimum job requirements to certain events
2022-03-06 22:04:05 -05:00
Casey
cc2c067dd2 Merge pull request #12373 from Very-Soft/dominantprey
Dominant Prey and Dominant Predators
2022-03-06 22:02:23 -05:00
VerySoft
9fff7e699f THE FINAL UPDATE INCLUDES DOMINANT PREDATORS 2022-03-06 21:51:54 -05:00