Commit Graph

20840 Commits

Author SHA1 Message Date
Ketrai
82e9c30aa7 Travis? 2018-05-26 22:51:05 +02:00
Ketrai
794db16782 Makes fennix attacks super weak. 2018-05-26 22:42:38 +02:00
Ketrai
8fb3bd6891 Adds Fennix code
Squelch
2018-05-26 15:45:11 +02:00
Arokha Sieyes
3a92a678ce Plane tweak for adminbuse 2018-05-25 12:48:30 -04:00
Aronai Sieyes
b1b9090430 Merge pull request #3757 from VOREStation/aro-cblind
Fix vulp colorblindness being mono instead
2018-05-24 19:33:24 -04:00
Arokha Sieyes
22bf8684e5 Fix vulp colorblindness being mono instead
Fixes #3740
2018-05-24 19:14:57 -04:00
Aronai Sieyes
abecdfe3fa Merge pull request #3499 from Verkister/engibork
New dogborg + Recycling update + Wet Dogborgs update
2018-05-24 17:45:08 -04:00
Aronai Sieyes
243bee8965 Merge pull request #3737 from Verkister/patch-25
Makes gurgled ID description even more obvious.
2018-05-24 17:36:59 -04:00
Aronai Sieyes
1d068ef41e Merge pull request #3742 from VOREStation/aro-smite
Adds 'Smite' verb and pray button
2018-05-24 17:35:27 -04:00
Aronai Sieyes
a9a293527c Merge pull request #3744 from Mewchild/MC-uniform
Gives KHI CMD to all command staff
2018-05-24 17:34:18 -04:00
Aronai Sieyes
86eeeca926 Merge pull request #3747 from VOREStation/aro-promnif
Fix promthean NIF shoving
2018-05-24 17:33:12 -04:00
Aronai Sieyes
ffb722c44a Merge pull request #3736 from VOREStation/aro-indsuit
Reduce armor on industrial rig
2018-05-24 12:26:51 -04:00
Aronai Sieyes
03e709d92f Merge pull request #3739 from Novacat/MiscTweaks
New Explorer Gear
2018-05-24 09:18:51 -04:00
Arokha Sieyes
6e33fb7648 Switch to shocking head and electrocute_act 2018-05-24 00:57:02 -04:00
Arokha Sieyes
3d522eb02f VS: Virgo specific smites 2018-05-23 23:04:07 -04:00
Arokha Sieyes
2fe6a59489 Fix promthean NIF shoving
Probably fixes #3746
2018-05-23 22:47:29 -04:00
Mewchild
c82d29cf81 Gives KHI CMD to all command staff 2018-05-23 16:58:10 -05:00
Unknown
994a81b6b6 Adds pumping sprite 2018-05-23 14:20:09 -04:00
Arokha Sieyes
0d594bba22 Missing smite closing span 2018-05-23 14:17:39 -04:00
Arokha Sieyes
89a36024c2 Adds 'Smite' verb and pray response button
For easier adminbuse!
2018-05-23 13:47:16 -04:00
Aronai Sieyes
4e8511abe7 Merge pull request #3741 from Verkister/nastyidcards
Adds and utilizes gurgled versions for all IDs
2018-05-23 10:34:24 -04:00
Verkister
285b29b34c Adds and utilizes gurgled versions for all IDs
-Now all different looking IDs have their sprited gurgled counterparts.
-This means gurgled IDs and guestpasses no longer all turn into the nasty default ID sprite.
2018-05-23 10:11:53 +03:00
Unknown
db739dfc34 Did not work as well 2018-05-22 13:30:37 -04:00
Unknown
2c1ad0076f Requested Fixes 2018-05-22 12:49:41 -04:00
Unknown
ca131caa10 New Explorer Gear
- Adds a new defensive exploration weapon intended for use by rear-line explorers, such as SARs and Pilots
- Ported Machete Sheath from Baystation, intended to be used with the machetes here
NOTE: I intended them to not be usable alongside holsters, but I am not sure how to go about this
- Explorer lockers will now come with a survival knife, machete, and machete sheath
2018-05-22 11:27:48 -04:00
Verkister
fb1e61a5b5 Update digest_act_vr.dm 2018-05-22 16:46:45 +03:00
Verkister
7d5d4a22d7 Update digest_act_vr.dm 2018-05-22 16:07:33 +03:00
Verkister
e93a0949f1 Makes gurgled ID description even more obvious.
People are still thinking they're completely wasted trash.
2018-05-22 16:05:52 +03:00
Arokha Sieyes
f0f8a89a34 Reduce armor on industrial rig
Now that we hand them out like candy, they probably shouldn't have way better stats than the security and exploration armors

(Also labeled the reasons for the other things being in there while I was in there
2018-05-21 14:40:25 -04:00
Aronai Sieyes
f5b068656a Merge pull request #3726 from VOREStation/aro-issue-3723
Replace explorer suit with basically the same suit
2018-05-18 22:14:10 -04:00
Aronai Sieyes
07c63fe802 Merge pull request #3718 from VOREStation/aro-issue-3697
Mostly comment out advanced GPSes
2018-05-18 22:13:45 -04:00
Arokha Sieyes
51b591f095 Replace explorer suit with basically the same suit
Except this one is wearable by all species, because there's no suit cycler that would work for the 'generic voidsuit'.
2018-05-18 14:14:19 -04:00
Arokha Sieyes
cb0f107526 Set a fake ID on shelter buttons to avoid messing with every door 2018-05-18 10:14:27 -04:00
Arokha Sieyes
4a5498cfe3 Mostly comment out advanced GPSes
Fixes #3697
2018-05-17 15:38:07 -04:00
Tad Hardesty
927050ce44 Fix various syntactic problems 2018-05-16 21:43:18 -07:00
Leshana
d53f405fb0 Merge pull request #3709 from VOREStation/aro-sayreflect
Message send failure reflection
2018-05-16 20:46:19 -04:00
Aronai Sieyes
bab82e9d01 Merge pull request #3688 from Heroman3003/no-riding-tents
Tentacles can be ridden no more
2018-05-16 18:44:48 -04:00
Aronai Sieyes
41a997d43e Merge pull request #3687 from VOREStation/aro-ssao-ex
Exclude some things from SSAO
2018-05-16 18:44:39 -04:00
Aronai Sieyes
d52923b17c Merge pull request #3667 from Verkister/nifsleeve
Fixes a bunch of NIF/resleeving related issues (and a tiny otherthing i discovered during tests)
2018-05-16 18:41:01 -04:00
Aronai Sieyes
74338280ee Merge pull request #3691 from VOREStation/aro-shelterquol
Capsule shelter QOL
2018-05-16 18:40:07 -04:00
Arokha Sieyes
297ac38eca Message send failure reflection
When a post is too long to send, reflect it back to the user in the chatbox so they can copypaste it into separate messages. Also increases the message limit from 1024 to 2048. If a message is longer than 5-messages worth, it is not reflected and a warning is sent instead to avoid easily consuming bandwidth for DDOS purposes with long messages.

I'd like to add markers in the message where the posts would have been truncated but that's... complicated.
2018-05-16 17:57:26 -04:00
Verkister
1a6441cbcb Squashed commit of the following:
commit 0422337a1ff4a96f27566727fb613f4a9ee993b1
Merge: bebd37667f 54d3e6d049
Author: Verkister <superverkelian@hotmail.com>
Date:   Tue May 15 12:22:42 2018 +0300

    Merge branch 'engibork' of https://github.com/Verkister/VOREStation into engibork

commit bebd37667fa38890590b46f45e9dc6bd76f13c56
Author: Verkister <superverkelian@hotmail.com>
Date:   Tue May 15 12:07:45 2018 +0300

    Engie borgo + Recycling update + Wet Dogborgs update
    -I really hope this squash merge attempt didn't go catastrophically wrong.

commit 54d3e6d049aee607daf7b356b4f5c2f7862ea9d9
Merge: af7807b238 36b6015aeb
Author: Verkister <superverkelian@hotmail.com>
Date:   Mon May 14 12:39:53 2018 +0300

    Merge branch 'master' into engibork

commit af7807b2386a3a3f222a012ecec2db2914bf3340
Author: Verkister <superverkelian@hotmail.com>
Date:   Tue May 8 13:19:22 2018 +0300

    Adds verb to refill borg extinguisher with water reserves.
    -Also makes human prey gurgled in sleeperbellies also give water according to their weight and size multiplier.

commit 700cbadfad4f13e976d8da5e5ac19c4381b84d4b
Author: Verkister <superverkelian@hotmail.com>
Date:   Mon Apr 30 16:13:43 2018 +0300

    The Wet Dogborg Update
    -Dogborgs now come with water reserve. (1000u, starts empty)
    -The water reserve is used by the tongue actions and floor scrubbing, which now require water.
    -Tongue actions spend 5 units each, and the scrubbing uses one unit per tile.
    -Yes, the licks also require water now. Slobbery.
    -The floor scrubbing can now be toggled on and off to preserve water.
    -The scrubber switch is a sprited module of its own for handy onscreen access when active.
    -The water reserves can be refilled by gurgling any reagents with sleeperbellies, and by using the tongue to lap up water from sinks and toilets lol.
    -Added a double check to analyzer belly to prevent it gaining levels from protected items.

commit 6872579dd9a91304dd0c00f6b0d78689bac63242
Author: Verkister <superverkelian@hotmail.com>
Date:   Thu Apr 19 18:25:59 2018 +0300

    oop

commit e50eba11034f14883a89c4a1031c344fca0c3b40
Author: Verkister <superverkelian@hotmail.com>
Date:   Thu Apr 19 18:19:30 2018 +0300

    Adds yet another new dogborg and other tweaks.
    -New engie oriented borgo comes with basic construction tools and stuff, no rcd or other fanciness.
    -Sheet synthesisers on this borg come with some extra capacity with the drawback of significantly slower charger replenish.
    -This comes to the other thing, which is the belly.
    -New borgo has a "matter decompiler" feature, which means it can recycle stuff to fill the material reserves. This thing reycles materials with autolathe rates though, none of that op drone decompiler stuff.
    -Now also janihound gut has a recycling feature.
    -The recycling guts don't give the borg any charge for the recyclable items, but other stuff charges fine.
    -Dogborg light replacer now starts with only 10 lights, and recharging it on the go draws resources from the recycled material reserves. Also it no longer recharges in borg charger.
    -Janihound can now also stack and drop steel/glass sheets to get the stuff out of the reserves.

    Other fixes:
    -Fixes certain dogborg tools not getting their naughty features unlocked with scrambled upgrade.
    -Minor fixes and cleanups in borgo sleeper code.
    -etc.

commit 096504ca95b8a662e911a1e92c195fe69a624f93
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Apr 18 08:14:04 2018 +0300

    Adds engie bork
2018-05-15 12:39:52 +03:00
Verkister
7a828f7cd0 removed SC self backup and added a null 2018-05-15 11:52:38 +03:00
Arokha Sieyes
4018e14d12 Revert "Upgrades Planetary Weather to vis_contents (#5170)"
This reverts commit e3e1a7ad9c.
2018-05-15 00:57:55 -04:00
Arokha Sieyes
58189980d2 Shelters: forgot this file 2018-05-14 22:51:11 -04:00
Arokha Sieyes
46f6121624 Capsule shelter QOL
Bolts/opacity button, roofs for multiz areas
2018-05-14 22:31:09 -04:00
Heroman3003
f8e8ba3e3a Removed riding tentacles/Unique text for Alraune 2018-05-15 12:11:15 +10:00
Aronai Sieyes
0a5181e210 Merge pull request #3603 from kcin2001/micromechs
Adds Micro mechs
2018-05-14 20:00:57 -04:00
Aronai Sieyes
c1a229a2b8 Merge pull request #3685 from VOREStation/aro-voreloadtypo
Fix a typo in vore load code
2018-05-14 19:59:57 -04:00
Arokha Sieyes
3d0e50e2a4 VS: The VS excludes for SSAO 2018-05-14 11:54:10 -04:00