Commit Graph

950 Commits

Author SHA1 Message Date
Aronai Sieyes
325d05317a Merge pull request #3126 from VOREStation/exp-ss-overlays
Port SSoverlays
2018-02-24 19:36:36 -05:00
Aronai Sieyes
436e0e8071 Merge pull request #3120 from VOREStation/aro-saremov
Remove unnecessary SA code
2018-02-24 19:28:44 -05:00
Leshana
fef30da831 Upgrades NSFW to use initialize() and SSoverlays
- Both as a first demonstration and as a practical bugfix, we upgrade the NSFW to use SSoverlay.   Instead of building a mutable_apperance and assigning it, we cut_overlays(), make our images, and call add_overlay() to queue it for compiling.
- We also must convert from using New() to initialize() becuase for annoying BYOND reasons,  some static variables in SSoverlays are not always instantiated before mapload.  So its important not to call overlays functions from New()  (We shouldn't be doing that ANYWAY for performance reasons, but now its even more true)
2018-02-24 18:33:53 -05:00
Arokha Sieyes
0d66593e14 Remove unnecessary SA code
They sleep in life() when nobody is around now
2018-02-24 14:53:53 -05:00
Aronai Sieyes
40357862f3 Merge pull request #3113 from VOREStation/aro-SIXHOURSAAAAHHHH
Adds a generic 'aura animation' system, applies to resizing
2018-02-24 14:43:35 -05:00
Arokha Sieyes
d68629fc80 VS: MA override removal changes 2018-02-24 11:44:57 -05:00
Arokha Sieyes
c99bf87547 VS: Make resizing use the aura animations 2018-02-24 11:01:36 -05:00
killer653
641348c744 BeyondMyLife's custom fluff items 2018-02-23 15:10:35 -05:00
Arokha Sieyes
08c0a64fec SA's with hands can scoop mobs 2018-02-22 23:48:15 -05:00
Aztectornado
105f986db1 Adds Siren jumpsuit 2018-02-22 06:00:41 -06:00
Aronai Sieyes
5c22da4cc0 Merge pull request #3059 from Mewchild/ringfix
Ringfix v2
2018-02-18 00:33:09 -06:00
Leshana
f34a0f104e Revert adding unnecessary proc and fixing paths for vietsi custom item. 2018-02-18 00:47:10 -05:00
Mewchild
6af91caf6b Ringfix v2 2018-02-17 23:02:41 -06:00
Leshana
0806ca868b Fix same-size mobs walking on each other and being unable to bump doors.
* handle_micro_bump_helping was unconditionally returning TRUE, overriding normal bump behavior.  Fixed to only return TRUE when its size conditions are met.
* As a side effect of that bug, now_pushing was not being set back to zero.  Fixing the prior bug solved that, but as an extra precaution, moved now_pushing = 0 out of the proc so it will get set back no matter what.
2018-02-17 22:44:12 -05:00
Leshana
5edfc7516b Adjust VOREStation guns for PolarisSS13/Polaris/#4185 2018-02-17 16:56:30 -05:00
Aronai Sieyes
6d0aba7f4a Merge branch 'master' into aro-puppers 2018-02-16 19:33:52 -06:00
Aronai Sieyes
49e945afb7 Merge pull request #3023 from Screemonster/stopkillingthedamncat
Adds newspapering, fixes mob digestion toggle, and other tweaks
2018-02-16 19:33:20 -06:00
Screemonster
33a384d5c3 makes them swat back, tweaks to exclude list 2018-02-16 10:19:12 +00:00
Arokha Sieyes
61dc4f53fc Refactor step code, and taur messages 2018-02-15 21:43:48 -06:00
Aronai Sieyes
67c7641d36 Merge pull request #3042 from Heroman3003/slugfix
Fix for crushing and new descriptions for Taur stompies
2018-02-15 18:17:03 -06:00
Aronai Sieyes
1dd86332d3 Merge pull request #3035 from VOREStation/aro-3022
Additional safety checks for removal of AI hologram
2018-02-15 18:05:22 -06:00
Aronai Sieyes
702997ffba Merge pull request #3036 from VOREStation/aro-3010
Fixes NSFW mode selection
2018-02-15 18:00:26 -06:00
Heroman3003
7b6ac1391f fix for condition
dumb error
2018-02-16 07:24:05 +10:00
Heroman3003
b0a627463b fix for crushing and taur stepping expanded
More descriptions for different intents of stepping for different taurs + fixed harm trampling not dealing any damage
2018-02-16 07:13:22 +10:00
Arokha Sieyes
2dffd17c39 Fix #3010 2018-02-15 02:46:11 -06:00
Arokha Sieyes
6c9526cec6 Fixes #3022 2018-02-15 02:42:00 -06:00
Arokha Sieyes
02e490af7a VS: Implement shadekin as a legit big deal 2018-02-15 01:15:24 -06:00
Mewchild
cb01bd8db5 Ringfix 2018-02-15 00:46:57 -06:00
Mewchild
bdb99ce7dc Updates Fluff ring so gloves can be worn over it, and so it functions as a stamp (similar to normal signet ring) 2018-02-13 17:13:25 -06:00
Screemonster
c9f5d6f234 squashed commits for improved newspapering 2018-02-13 17:53:02 +00:00
Verkister
12e2385dc1 Fixes dead mobs finishing noms.
-I thought someone would have fixed this already smh.
2018-02-11 23:06:33 +02:00
Verkister
4be014147e Fixes belly contents showing up on screen inventory
-Fixes prey backpack contents popping up on pred's screen after getting dumped.
-Adds an automatic closing of prey's storage for pred upon ingestion to prevent "secret backpacks"
-Also makes trash vorings use selected belly sound while at it.
2018-02-11 14:34:55 +02:00
Aronai Sieyes
7ff0493074 Merge pull request #2998 from Jwguy/Silver-AwooCosplayCrate
AwooCosplayCrate
2018-02-10 23:06:35 -06:00
Silver
8c3c0430f6 Correct Origin Tech Values 2018-02-10 22:29:46 -06:00
Silver
ab40c9d38c Added Preferred Change to Deactivation Text 2018-02-10 18:26:51 -06:00
Verkister
d740ae6f90 Fixes itemweak gurgles and food misbehaving
-Itemweak gurgles no longer add everything unconditionally to items_preserved list even if the item was digested for being food/holder/organ.
2018-02-10 20:25:39 +02:00
Silver
ef4d87a352 AwooCosplayCrate
Adds Wolfgirl Cosplay Crate to Supplypacks under Recreation.

Adds Wolfgirl Replica Sword and Autumn Shield.

Adds the above and three existing items to aforementioned crate.
2018-02-08 12:57:18 -06:00
Aronai Sieyes
c0a7016d9a Merge branch 'master' into expgun2 2018-02-08 01:13:05 -05:00
Verkister
78ab5c37f4 Squashed commit of the following:
commit 88761abcbdad12b25e4771837331ee3c40aeff19
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Feb 7 11:58:47 2018 +0200

    Some more gurgle related tweaks and fixes.
    -Removes gut transfers passing along preserved items list. (redundant with modern digest_act)
    -Adds panel update to trash eating.
    -Fixes borg sleeper gurgles causing double, maybe even triple damage due to being added into processing_objects list multiple times.
2018-02-07 12:01:11 +02:00
Verkister
d2cb1e3011 Merge branch 'patch-8' of https://github.com/Verkister/VOREStation 2018-02-07 10:56:18 +02:00
Cyantime
d0f32b4a53 Adds frontier phaser to cargo 2018-02-06 21:58:08 -05:00
Cyantime
be7d0dd8c2 Adds expedition guns to map 2018-02-06 21:02:01 -05:00
Cyantime
12747725d9 basic weapons for the expeditions 2018-02-06 20:02:55 -05:00
Spades
dd7859ac0a Merge pull request #2978 from VOREStation/context-menu
Removes Licking from context menu
2018-02-05 10:13:46 -05:00
Spades
be91065e8e Licking 2018-02-05 06:43:55 -05:00
Verkister
dae786c52d Makes trash gains slightly more consistent.
-Basically everything else is more or less 1/10 ratio between nutrition and borg cell charge and now this is too.
2018-02-05 10:25:48 +02:00
Aronai Sieyes
bb09406ea0 Merge pull request #2934 from Verkister/yummytrash
Trashcan perk refactor and slight expansion.
2018-02-04 16:56:47 -05:00
Verkister
f553219bbd Squashed commit of the following:
commit b3d348258c4c93a1df81652bdf68fd00f4130369
Author: Verkister <superverkelian@hotmail.com>
Date:   Sun Feb 4 22:40:08 2018 +0200

    Squashed commit of the following:

    commit 5faa5f9d063e57400584ab1ae458e626629b6842
    Author: Verkister <superverkelian@hotmail.com>
    Date:   Sun Feb 4 22:31:10 2018 +0200

        Update pai.dm

commit fd4bbdc6b99d74d94befb440ffe5e0c23a98a918
Author: Verkister <superverkelian@hotmail.com>
Date:   Sun Feb 4 11:28:58 2018 +0200

    Makes pAI cards, AI cards, and posis "edible"
    -Also makes it so that pAI cannot fold out if inside a gut.

commit 1d13c207240c4bc296b188533e8cf50b1424cc36
Author: Verkister <superverkelian@hotmail.com>
Date:   Sun Feb 4 10:40:38 2018 +0200

    some more trashcan refactoring

commit 28d02c272dbd218d2d91c91fb1ecec999b9dd05e
Author: Verkister <superverkelian@hotmail.com>
Date:   Sat Feb 3 13:32:14 2018 +0200

    Trashcan perk refactor
2018-02-04 22:43:02 +02:00
Aronai Sieyes
566507ed76 Merge pull request #2965 from Verkister/numbflush
Clears the prey of numbenzyme on digestion death.
2018-02-04 15:11:10 -05:00
Aronai Sieyes
b087ff3207 Merge pull request #2929 from VOREStation/Cameron653-patch-3
Sebastian permit & magazine update & fix
2018-02-04 15:06:31 -05:00