Commit Graph

27229 Commits

Author SHA1 Message Date
Razgriz
0c713aa549 Merge pull request #530 from Darlantanis/ConfettiCannon
Confetti cannon
2020-09-05 10:58:08 -07:00
Darlantan
09768ea90c Confetti cannon
-Adds confetti cannon
-Adds grenade object needed to make the cannon work
-Makes the cannon printable at RnD
2020-09-05 07:15:49 -04:00
Nadyr
35fa371286 Merge pull request #513 from cadyn/liquid-bellyfix
Many bugfixes!
2020-09-05 06:17:03 -04:00
Darlantan
1b220d1cd4 Revert "Check-out commit"
This reverts commit dc957fe40b.
2020-09-02 03:16:25 -04:00
Darlantan
dc957fe40b Check-out commit
Committing now so I can work on other things
2020-09-02 03:10:18 -04:00
Nadyr
dd034573a4 Merge pull request #524 from MisterGrimm/master
Fixing Xenomorph life cycle + numerous changes and balances.
2020-09-01 01:21:06 -04:00
Darlantan
56e2ed6fb5 SynxTweaks
-Fixes synx chem
-Fixes synx venom injection
-Balancing stuff
-Adds Distend Stomach ability
-Re-adds parasitism
2020-08-30 06:01:08 -04:00
Sym
0dec16535d Adding CHOMPedit to edited lines and files, with brief descriptions.
Can't believe I didn't think of doing this already.
2020-08-29 02:28:30 -04:00
Nadyr
8c9064bf06 Merge pull request #523 from loburd/LOTESTBRANCHCHOMPVORELOL
SYNX UPDATE. V1 (No disended stomach verb yet.)
2020-08-29 00:39:45 -04:00
Nadyr
e381710ec8 Merge pull request #508 from Shadow-Quill/Logging
More Attack Logging!
2020-08-29 00:18:42 -04:00
cadyn
860615c70c Upstream oopsie-fixes 2020-08-28 13:00:42 -07:00
loburd
b984de8ca6 Update synx.dm 2020-08-28 16:00:36 -04:00
loburd
1dc3fb91ac Update synx.dm 2020-08-28 15:57:54 -04:00
Sym
20bcadbec6 Fixing Xenomorph lifecycle + changes
Time to get swifty.
2020-08-28 12:29:06 -04:00
loburd
6982e71429 Update synx.dm 2020-08-26 19:41:45 -04:00
loburd
32754366d5 Update synx.dm 2020-08-26 18:04:56 -04:00
loburd
bbacf6aafa Update synx.dm 2020-08-26 17:51:14 -04:00
loburd
55ad397fef Update synx.dm 2020-08-26 17:43:23 -04:00
loburd
96e6340b2a Update synx.dm 2020-08-26 17:39:43 -04:00
loburd
1eba702ac5 Update synx.dm 2020-08-26 17:34:58 -04:00
loburd
fe59dedb71 Update synx.dm 2020-08-26 17:32:12 -04:00
loburd
801820c7ce Update synx.dm 2020-08-26 17:24:57 -04:00
loburd
6db5656fcf Update synx.dm 2020-08-26 17:23:03 -04:00
loburd
1ba7e2b396 Update synx.dm 2020-08-26 17:22:12 -04:00
loburd
dfc96db2d3 Update synx.dm 2020-08-26 17:12:44 -04:00
loburd
6895c86087 Update synx.dm 2020-08-26 17:11:39 -04:00
loburd
8edfddec12 Update synx.dm 2020-08-26 17:06:01 -04:00
loburd
4d5eeee940 Update synx.dm 2020-08-26 16:58:22 -04:00
loburd
1ce4b0e625 Update synx.dm 2020-08-26 16:56:39 -04:00
loburd
8250daacba Update synx.dm 2020-08-26 16:38:20 -04:00
loburd
e588471a88 Update synx.dm 2020-08-26 16:24:38 -04:00
Cadyn
3bc407b0d3 Consistency with upstream PRs 2020-08-24 14:28:07 -07:00
Cadyn
7139225191 Following feedback 2020-08-24 14:23:08 -07:00
Cadyn
5e02857320 Many bugfixes! 2020-08-23 19:54:11 -07:00
Razgriz
90267f9bce Fix recoil again
Greater than/less than. UGH.
2020-08-23 17:44:19 -07:00
Shadow Quill
86f0a3b33c Logging! 2020-08-21 14:33:59 -05:00
Erik
61eca990df Prep for overmap
A couple variable changes to allow overmap shuttles to function properly and for the overmap to be more than just empty space.
2020-08-20 15:47:31 -07:00
Nadyr
af1e935ae7 Merge pull request #500 from LunarFleet/Lun-Merc
Flechette merc nerfs
2020-08-19 05:29:53 -04:00
LunarFleet
843e2f36d4 Fixes my own stupidity 2020-08-18 08:19:33 -04:00
Nadyr
42a43c9c1b Merge pull request #486 from LunarFleet/Lun-Medinerd
Re-adds mediguns, removes ML3M and ML-3 references
2020-08-18 01:19:54 -04:00
LunarFleet
1617ac4627 Flechette merc nerfs
Praise
2020-08-17 10:58:14 -04:00
Razgriz
2f46a85e16 Merge pull request #472 from Rykka-Stormheart/shep-dev-hyena-standalone
Adds Hyena Cackle Emote - Standalone
2020-08-15 00:49:42 -07:00
Razgriz
06c0d1c9cf Merge pull request #481 from Rykka-Stormheart/shep-dev-ghost-examine-QOL
Admin ghosts can now examine other ghosts to pull up admin tools!
2020-08-15 00:49:32 -07:00
Rykka
35784fbdb5 Earlyport Resleeving Fixes
Earlyport of https://github.com/VOREStation/VOREStation/pull/8643 with a minor change increasing the linter from 80 -> 120, the rest of the backend tweaks/fixes will make their way downstream afterwards.
2020-08-15 03:08:48 -04:00
Razgriz
fdf35dc7c7 Merge pull request #474 from Kazzc/UNIVERSEshrink2.0
Adding bluespace to our universe.
2020-08-14 16:16:36 -07:00
Kassc Zeravla
84dc1e7a99 Further fixes
-Modified Ore generation, it should spawn ores in the mines now. Will be more numerous than normal but it's a guarantee they will spawn.
-Modified 'PrideRock.DMM' to not be a endless death-trap
-Modified 'methlab.dmm' to have stuff in the safe.
-Modified 'Oldhotel.dmm' added the correct oven
-changed name of abandonedhome.dmm to lonehome.dmm see if that fixes travis (or something)
2020-08-14 18:15:24 -04:00
LunarFleet
0389cc8d0f Forgot the charging change; made sure cells cannot be used on corpses unless it is corpsemend. 2020-08-14 09:19:05 -04:00
LunarFleet
5e22710209 Take two 2020-08-13 09:54:11 -04:00
Razgriz
2d05b17894 Disable world announcement for persistance
Because while I am testing shit, players asking "wat is dis" and whinging and complaining about it is annoying.
2020-08-13 02:40:41 -07:00
Rykka
68b1f76b80 Adds gao and cackle to vhelp!
Forgot to add cackle, and turns out gao wasn't on the list either.
2020-08-12 22:01:26 -04:00