Commit Graph

19239 Commits

Author SHA1 Message Date
Arokha Sieyes
b9e8b9641c Various and sundry admin messages 2018-01-06 19:15:54 -05:00
Arokha Sieyes
cd3a332fd2 Merge pull request #2690 from VOREStation/aro-commlinkqol
Commlink QoL
2018-01-05 21:36:14 -05:00
Arokha Sieyes
950cea6c34 Merge pull request #2689 from VOREStation/aro-sizegunqol
Sizegun QoL/Nerf
2018-01-05 21:36:06 -05:00
Arokha Sieyes
82a9a3c89e Sizegun verb change 2018-01-05 20:56:07 -05:00
Arokha Sieyes
f0023b5c9a Commlink QoL
Makes it properly auto-register your name instead of coming as Unset every time.
Makes messages to Commlinks properly stay in the commlink user's head.
2018-01-05 17:57:39 -05:00
Arokha Sieyes
1183e5fa80 Sizegun QoL/nerf
I want clicking it in-hand to let me change the size (so I can do it with Z). And I want the box to show the currently set size when I'm changing it instead of always just showing 200. So that's what it does now.
Also jeez. If we have the technology to make a military-grade battery recharge in just a few seconds, why don't we use it other places? Makes the thing not self-recharge. Just stuff it in a recharger. There are plenty.
Added various rechargers everywhere in public places on the map, since there weren't enough, just to be sure.
2018-01-05 17:16:23 -05:00
Arokha Sieyes
e3188db869 Merge pull request #2686 from VOREStation/aro-nifprom
Allows special Promethean NIF installation
2018-01-05 14:49:12 -05:00
Arokha Sieyes
d5ec045b1a Allows special Promethean NIF installation
Just shove it directly into their face. Make sure it's a bioadaptive one though otherwise it won't do anything.
Target head, click, wait a while. They ARE slime people or whatever so... makes sense :V
2018-01-05 14:30:14 -05:00
Leshana
6b87ecd2b8 Merge pull request #2685 from VOREStation/aro-lessmagic
Tweak lethal succubus drain
2018-01-05 14:22:39 -05:00
Leshana
65724afe58 Merge pull request #2687 from VOREStation/aro-sani
Fixes a couple of charsetup sanitizes
2018-01-05 14:22:07 -05:00
Leshana
f50d5153ff Merge pull request #2681 from VOREStation/aro-nsfwhos
Gives the HoS a KHI-102b NSFW
2018-01-05 14:21:59 -05:00
Arokha Sieyes
13b28ede55 Fixes a couple of charsetup sanitizes
No more "YOU DIDN'T SET A SCALEEEEE" on new characters. Defaults to 100%.
2018-01-05 12:28:15 -05:00
Arokha Sieyes
1110d6cf82 Tweak lethal succubus drain
Mostly remove the OOC magic-implying wording about 'life energy' (since setting is w/o magic) so it can be whatever in your private RPs (someone was asking about using it to represent stealing bodyheat which is cool).
`absorbing_prey` was never unset if they were found to be indigestible, so fixed that
Two stages also sent two messages at the same time
Removed the needless casting of src to C since it's defined on human already

Maybe in the future consider using cloneloss instead of brainloss? Alkysine is one of the easiest drugs to make, and if I jack myself up with it I'd maybe be immune to having my nutrition/heat/whatever stolen which seems ~unusual~
2018-01-05 10:59:20 -05:00
Arokha Sieyes
ce0b3e9678 Merge pull request #2664 from Verkister/buppers
Fixes non-dogborgs butting into dogborg icon update territory.
2018-01-05 10:11:13 -05:00
Arokha Sieyes
7bd32b056d Merge pull request #2676 from Screemonster/bellybugs
Fixes some bugs relating to absorption and struggling, makes struggle feedback messages clearer
2018-01-05 10:10:46 -05:00
Arokha Sieyes
5a81cbefba Merge pull request #2671 from blazerules/master
Electrostaff Custom Item
2018-01-05 10:08:32 -05:00
Arokha Sieyes
82f373aa1e Merge pull request #2672 from Cameron653/EMERGENCY
January Sync
2018-01-05 10:04:41 -05:00
Arokha Sieyes
5c6637cffa Gives the HoS a KHI-102b NSFW
It's just my fluff gun. But sharing is caring.

From the ingame fluff:
"Variety is the spice of life! The 'Nanotech Selectable-Fire Weapon' is an unholy hybrid of an ammo-driven energy weapon that allows the user to mix and match their own fire modes. Up to three combinations of energy beams can be configured at once. Ammo not included."
"This gun is an energy weapon that uses interchangable microbatteries in a magazine. Each battery is a different beam type, and up to three can be loaded in the magazine. Each battery usually provides four discharges of that beam type, and multiple from the same type may be loaded to increase the number of shots for that type."
"The Kitsuhana 'Nanotech Selectable Fire Weapon' allows one to customize their loadout in the field, or before deploying, to achieve various results in a weapon they are already familiar with wielding."

The HoS's includes 2 lethal, 2 stun, 1 net, and 1 ion battery. There are other batteries (like instagib!) but there's no way to get them normally. There's also one that strips people.
2018-01-04 23:57:11 -05:00
Leshana
968697d02e Replaced world.tick_usage with TICK_USAGE macro in VOREStation code 2018-01-04 22:57:00 -05:00
Leshana
28c193cbdb Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04
# Conflicts:
#       code/game/objects/items/devices/communicator/communicator.dm
#       code/modules/client/preference_setup/occupation/occupation.dm
#       code/modules/mob/living/simple_animal/animals/cat.dm
#       code/modules/mob/mob_helpers.dm
#       code/unit_tests/zas_tests.dm
#       maps/southern_cross/southern_cross-1.dmm
#       maps/southern_cross/southern_cross-3.dmm
#       maps/southern_cross/southern_cross-6.dmm
#       vorestation.dme
2018-01-04 22:44:04 -05:00
Screemonster
9f15ee88a0 Adds vore panel preference to enable/disable being eaten by mobs 2018-01-05 02:53:13 +00:00
Screemonster
3090acdceb does the absorb-release-thing more betterer 2018-01-05 01:08:22 +00:00
Screemonster
a0b02b57c1 fixes some bugs in absorption and struggling 2018-01-04 23:49:06 +00:00
Neerti
250fe6e2ff Fixes Exploit with Power Tools 2018-01-04 03:08:56 -05:00
Neerti
58a8e6a066 Merge pull request #4499 from Neerti/1/3/2018_why
Fixes Exploit with Power Tools
2018-01-03 15:50:02 -05:00
Neerti
5a0a04d2dd Fixes Exploit with Power Tools 2018-01-03 15:40:43 -05:00
blazerules
77080534a6 Electrostaff Custom Item
Please kill me I am bad at noticing small things.
2018-01-03 11:08:25 +02:00
blazerules
43108a5dab Electrostaff Custom Item
Fixed typos
2018-01-03 10:57:31 +02:00
blazerules
07b0b071ce Electrostaff Custom Item
Changes as asked for by Arokha
2018-01-03 10:07:52 +02:00
blazerules
2d434c40d5 Electrostaff Custom Item
This is the code for the stunstaff as was approved here

https://forum.vore-station.net/viewtopic.php?f=27&t=1204
2018-01-03 09:28:43 +02:00
Neerti
9ab7c0bf0c Merge pull request #4470 from VOREStation/vplk-ss-machines
Convert machinery controller to StonedMC subsystem
2018-01-02 23:21:47 -05:00
Neerti
d7b5cca562 Merge pull request #4496 from Atermonera/admin_dsay
Admins can see dsay again
2018-01-02 23:20:39 -05:00
Atermonera
3210625822 Admins can see dsay again 2018-01-02 17:11:50 -08:00
Atermonera
c9941e2450 S&R loadout spacing (#4486)
* Revert "Update #3? 4?"

* Revert "Revert "Update #3? 4?""

* Adds the disabled mech tools.

* indentation

* S&R is inline w/ explorer roles in char setup
2018-01-02 20:04:32 -05:00
Anewbe
2f84a7dc95 Merge pull request #4489 from VOREStation/qdel-hints-gen5
Additional Destroy proc fixes
2018-01-02 20:04:02 -05:00
Anewbe
f46dabddc0 Merge pull request #4494 from VOREStation/vplk-small-fixes
Fix runtimes in MouseDrop when dragging out of the screen
2018-01-02 20:03:47 -05:00
Anewbe
ae5bc40a53 Merge pull request #4483 from Verkister/smoothlimbs
Eliminates one possible culprit behind dismemberment crashes.
2018-01-02 20:02:48 -05:00
Anewbe
1f22838bcc Merge pull request #4482 from Neerti/1/1/2018_rainbow_slime_fix
Rainbow Slime Extracts No Longer Make Wild Slimes
2018-01-02 20:01:38 -05:00
Verkister
43d1db6515 opto 2018-01-03 00:06:37 +02:00
Verkister
5bb962a7e0 fiixes 2018-01-02 23:36:30 +02:00
Arokha Sieyes
2bcee3d20a Merge pull request #2666 from Verkister/OwO
Makes belly bulge examine add up prey sizes.
2018-01-02 16:23:26 -05:00
Arokha Sieyes
e76732c0e5 Merge pull request #2662 from VOREStation/aro-farmbotsan
Destroys botany forever
2018-01-02 16:23:14 -05:00
Verkister
022e3cf63b Update belly_vr.dm 2018-01-02 23:08:27 +02:00
Arokha Sieyes
f7f4a15c50 Destroys botany forever
Why do we have a robot that literally does the entire job. Basically people leave it and it becomes a lag generator forever. Removes farmbot harvesting and removal of dead plants, plus adds an idle timer for 150 process cycles without a target causing it to turn itself off. So basically it will tend the plants and keep them alive, but you need to come harvest them sometimes.
2018-01-02 16:06:13 -05:00
Verkister
899d7c0b2b Makes belly bulge examine add up prey sizes.
-If prey 1 is too small to show up, ya get no visible bulge.
-But if you eat another prey also too small to show up, but take enough space together with the first one, ya get bulge.
-Also if you eat a small person, and then a big person, ya now get bulge too. (unlike before)

OwO
2018-01-02 19:03:47 +02:00
Verkister
11a8ea16ef Fixes bugs related to picking shit from empty belly content lists.
-Makes digestion modes "finish" once everything unprotected is gone.
-This also means your guts will no longer permagurgle fruitlessly while nothing but a shitty ID in there.
2018-01-02 18:27:44 +02:00
Verkister
2549beea17 Fixes non-dogborgs butting into dogborg icon update territory.
-Also adds a dogborg var for special functions such as the icon bs.
2018-01-02 18:07:33 +02:00
Neerti
259b0a6702 Merge pull request #4465 from VOREStation/pol-railguns
Tweak out-of-ammo behavior on railguns
2018-01-02 03:19:23 -05:00
Neerti
0a147678e5 Merge pull request #4477 from Cyantime/mechpipe
Bars mechs from entering disposal chutes.
2018-01-02 03:16:50 -05:00
Arokha Sieyes
ca9b36e6b1 Merge pull request #2651 from VOREStation/Cameron653-patch-2
Makes the soulcatcher able to have 2048 characters
2018-01-02 02:45:47 -05:00