Commit Graph

19221 Commits

Author SHA1 Message Date
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
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
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
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
Arokha Sieyes
2ad006c3b2 Merge pull request #2652 from VOREStation/Cameron653-patch-3
Swaps two words around.
2018-01-02 02:45:28 -05:00
Arokha Sieyes
63dd746cca Merge pull request #2659 from Cyantime/resleevehealth
Prevents low health bodies from dying on creation
2018-01-02 02:45:16 -05:00
MarinaGryphon
3f98312535 Ports hoists, as well as some macros, from Aurorastation. (#4451)
* Ports hoists.

* Ports use_check
2018-01-01 12:17:35 -08:00
Verkister
2c02938b1b Update organ_external.dm 2018-01-01 18:49:22 +02:00
Verkister
a6d45cf39a Eliminates one possible culprit behind dismemberment crashes.
-Okay so. The dismemberment related crashing has decreased in the mob icon cache related cases, but another circumstance has been revealed pointing towards the severed limbs themselves.
-(Someone got splattered yesterday downstream and nuked half server into chain crashing)
-Anyhow. I personally had completely forgotten to update my client last year from an awfully outdated pre-PIXEL_SCALING version, but I happened to do it way after people began crashing and cannot remember encountering a single crash from the before time.
-Which led to a theory that our poor little Byond simply has trouble adjusting to fresh features and occasionally gets overwhelmed by the task of tossing around a bunch of severed limbs inheriting their owner's visual properties while also having to randomly rotate each one.
-This thing just disables pixel scaling from severed limbs upon dismemberment.
-Because of the evil nature of the bug unpredictably manifesting in action and often leaves some witnesses un-crashed, I have no proof if this helps anything but I'll just toss it up and see if it sticks.
2018-01-01 18:40:48 +02:00
Neerti
41137eeedb Rainbow Slime Extracts No Longer Make Wild Slimes
Also renames wild slime to feral slime.
2018-01-01 08:20:55 -05:00
Cyantime
e6d09798a6 Prevents low health bodies from dying on creation 2017-12-31 22:45:44 -05:00
Cameron653
9bcb4fb7ad no fun allowed 2017-12-31 21:37:27 -05:00
Cyantime
c0a446d106 Mechs don't fit in disposal chutes 2017-12-31 17:17:23 -05:00
mistyLuminescence
c443875898 Dropper and bloodpack improvements (#4453)
*Droppers transfer fractions adding to 1

*IV packs can be relabeled
2017-12-31 11:49:20 -08:00
Neerti
3ee3173a9f Merge pull request #4449 from Verkister/sleeby
Enables rest icons for simplemobs that have them.
2017-12-31 07:30:09 -05:00
Leshana
064f2fe9ca Additional types which need Destroy to return qdel hints (and other Destroy fixes) 2017-12-30 16:02:27 -05:00
Leshana
31a46e183b Fix runtimes in MouseDrop when dragging out of the screen
* MouseDrop()'s over_object may be null if dropping over a stat panel or over other empty space. Fix runtimes from assuming it is not null.
* Fixes Runtime in clothing_accessories.dm,54: Cannot read null.name
* Fixes Runtime in evidencebag.dm,21: Cannot read null.loc
2017-12-30 11:26:41 -05:00
Belsima
ff35fe9f56 Adds the disabled mech tools. (#4445)
* Adds the disabled mech tools.
2017-12-29 21:44:04 -08:00
Mechoid
3eb479b85f Merge pull request #4468 from Neerti/12/29/2017_the_resource_war
Might Fix Resource Lag
2017-12-29 18:05:42 -08:00
Cameron653
6841b5a6fe this here stuff 2017-12-29 20:01:23 -05:00
Leshana
a1734c97e9 Moved makepowernets() into SSmachines initialization proc. 2017-12-29 15:32:06 -05:00
Leshana
a97a574278 Transformed the machinery processor into an StonedMC subsystem
* This is PHASE 1 of a multi-phase conversion.  In this first phase we implement the subsystem, but leave it processing the existing global list variables.  In the next phase we will switch to use datum variables in the subsystem.  The main reason for splitting into two phases is ease of code review; change the meaningful code without the hundreds of machines -> SSmachines.machinery substitutions.
* We did declare macros for adding/removing things to the processing lists, and convert everywhere to use the macros.
* Added var/is_processing to /datum to keep track of whether an instance is already in a processing list (prevents it being in the list twice!) and also debugging, making sure its not in two lists etc.
* NOTE: The global machines list is **no longer sorted** for performance reasons.  As far as I know, the only module that actually ever cared was cameras.   Our camera system already handles its own sorting in the cameranets anyway, so it should no longer be needed.
2017-12-29 15:31:59 -05:00