Commit Graph

4640 Commits

Author SHA1 Message Date
Joonas Rikkonen
05add5b82d Merge pull request #401 from BlueTheKing/master
Added oxygenite tank, ancient weapon changes
2018-05-30 11:16:00 +03:00
Blue
87b21785b0 Full paths to sound files 2018-05-27 20:01:47 +02:00
Blue
5018d327c4 Full paths to sound files 2018-05-27 19:58:15 +02:00
Blue
6bc52aec4b Full path to sound file 2018-05-27 19:56:55 +02:00
Blue
9479062613 Full paths to sound files 2018-05-27 19:55:37 +02:00
Blue
f32d2a3d38 Full paths to sound files 2018-05-27 19:43:14 +02:00
Blue
26b357b45d Full paths to sound files 2018-05-27 19:42:04 +02:00
Blue
4fc5c998de Full paths to sound files 2018-05-27 19:40:12 +02:00
Blue
4c3dcfb84f Full paths to sound files 2018-05-27 19:38:34 +02:00
Blue
17e3095961 Full path to sound file 2018-05-27 19:37:28 +02:00
Blue
fd92c78807 Full paths to sound files + extra comment 2018-05-27 19:34:07 +02:00
Blue
c004879581 Full paths to sound files 2018-05-27 19:29:42 +02:00
Blue
eb6bf56379 Plasma cutter can now use the oxygenite tank 2018-05-26 19:02:45 +02:00
Joonas Rikkonen
144122b5e1 Merge pull request #421 from BlueTheKing/patch-2
Locky typo fixed
2018-05-24 10:40:24 +03:00
Joonas Rikkonen
49546435ce Merge pull request #418 from Tazial/master
Change log names to be sortable by file name
2018-05-24 10:39:44 +03:00
Blue
a0b3fe7b46 Locky typo fixed
"loxky" to "locky"
2018-05-23 21:25:55 +02:00
Tazial
88003a35c7 Changed log names to be sortable by file name 2018-05-22 18:25:12 -04:00
Joonas Rikkonen
76e8b078c3 Added missing railgun sprite & fixed indentation in the new item configs 2018-05-21 20:59:11 +03:00
Joonas Rikkonen
914e11d878 Merge branch 'master' of https://github.com/Regalis11/Barotrauma 2018-05-21 20:31:01 +03:00
Joonas Rikkonen
b9b3c96f99 Fixed Timing.TotalTime not being updated in the dedicated server. Caused clients never timing out, AIObjectiveFixLeaks not working at all, reactor usage not being logged and possibly other issues. 2018-05-21 20:30:51 +03:00
Joonas Rikkonen
384453b05c Fixed compiler errors caused by mission refactoring in the server project 2018-05-21 20:27:23 +03:00
Joonas Rikkonen
bb31fd1e73 Moved some client-specific limb code to the client project, dripping water particles when characters get out from water 2018-05-21 19:17:34 +03:00
Joonas Rikkonen
2805ca78c4 Merge pull request #412 from ClasticM/patch-2
Railgun Shell Rack
2018-05-21 11:48:03 +03:00
Joonas Rikkonen
06e99cdfda Merge pull request #411 from ClasticM/patch-1
Rear Railgun Controller/Additional Railgun Loaders
2018-05-21 11:47:51 +03:00
ClasticM
a71c10a2bc Railgun Shell Rack
Adds a rack capable of holding 3 Railgun shells,
so players / sub makers won't have to store shells on the floor anymore. Also helps the crew keep track of how many Railgun shells they sub have. 

Because the racks take up space, it also would help with balancing subs for PvP and so on.

texture located in "content/items/weapons/railgunetc2.png", which it shares with the new loaders and rear facing controller.
https://imgur.com/muAIF9P

This feature has been requested a lot lol, so I hope this will make a lot of people really happy
2018-05-18 20:13:12 -05:00
ClasticM
9da4deaed5 Rear Railgun Controller/Additional Railgun Loaders
Tested code for new Railgun items
 
* "Rear Railgun Controller" - Rearward facing Railgun controller

* "Railgun Single Loader" - Vertical loader with 1 shell capacity
* "Forward Railgun Loader" - Forward facing loader with 1 shell capacity
* "Rear Railgun Loader" - Rearward facing loader with 1 shell capacity

Gives sub makers more variety and different ways to arm subs. Can also be used to make a challenging balance with the weapons that requires more teamwork to operate. Also useful for simulating torpedo's tubes

Sprite example:
https://imgur.com/muAIF9P

All items tested and implemented.
2018-05-18 19:58:09 -05:00
Joonas Rikkonen
95fc1cc025 Mission initialization fixes 2018-05-18 12:23:31 +03:00
Joonas Rikkonen
f931d81aed Mission refactoring (mission prefabs) and option to select which types of missions can be selected when mission type is set to random (TODO: a way to set the allowed types from the UI). 2018-05-17 23:45:29 +03:00
Joonas Rikkonen
244acd3ec5 Fixed character getting spawned at a random spawnpoint in any sub if no spawpoint that fits the character's job is found, making it possible for them to spawn inside the respawn shuttle. Closes #408 2018-05-17 19:56:36 +03:00
Joonas Rikkonen
cc594a502c Merge pull request #406 from BlueTheKing/patch-1
Docking port and hatch changed
2018-05-10 15:59:00 +03:00
Blue
fed959e8eb Docking port and hatch changed
Docking port needs electrical skill to get fixed.
Both construction skill requirement changed to 50
2018-05-10 13:12:54 +02:00
Blue
0c8f6edbcd Diving gear changed a bit
Both the diving suit and mask can use both the oxygenite shard and tank.
The shard is a bit less effective than the tank though.
I'm unable to get the plasma cutter to work though. :(
2018-05-08 23:27:40 +02:00
Joonas Rikkonen
5ea88a0929 Fixed explosives not detonating inside railgun shells. Closes #400 2018-05-08 10:31:28 +03:00
Blue
100d1176f8 Added oxygenite tank, ancient weapon changes
+ Oxygenite tank added (taken from BTE)
+ Ancient Weapon
Now can use both the oxygenite shard and tank
+Diving Suit/Mask
Can no longer use the oxygenite shard (replaced with the tank)
+ Welding Tool / Plasma Cutter
Oxygenite can be placed in but can't actually be used
+ Fabricator
Oxygenite tank craftable
2018-05-08 01:36:01 +02:00
Blue
7b8a6ece93 Merge pull request #1 from Regalis11/master
Updated to last original master commits
2018-05-07 23:00:07 +02:00
Joonas Rikkonen
421e77cc3e Fixed itemcomponents being loaded incorrectly if an item has multiple components of the same type. 2018-05-07 11:15:49 +03:00
Joonas Rikkonen
7dd4dca2ed Fixed crashing when a round starts if the sub has been saved while a fabricator was running. Closes #398 2018-05-07 11:15:12 +03:00
Joonas Rikkonen
bdc9ca6d59 Merge pull request #399 from BlueTheKing/master
Deconstructing certain items now gives materials
2018-05-07 10:41:00 +03:00
Blue
890c0dc1d9 Deconstructing certain items now gives materials
Some tools and the body armor wouldn't give any materials
2018-05-05 23:08:01 +02:00
Juan Pablo Arce
d0c1d170f3 Increased searchlight camera offset to 515
Requested by Clastic, the person who submitted the item
2018-05-04 19:47:49 -03:00
Joonas Rikkonen
323c9ceabb v0.8.1.2 2018-04-25 21:35:03 +03:00
Joonas Rikkonen
7c9c3195bf Need to copypaste more carefully (e15fa11) 2018-04-25 20:58:11 +03:00
Joonas Rikkonen
e15fa11d6e Fixed meds not being usable with a medical syringe. Closes #388 2018-04-25 16:39:12 +03:00
Joonas Rikkonen
ed22ca360f Fixed AND/OR or components staying inactive until they receive their first signal. Closes #387 2018-04-25 14:43:44 +03:00
Joonas Rikkonen
8190358d2b v0.8.1.1 2018-04-24 22:21:16 +03:00
Joonas Rikkonen
87bfa89f80 Merge branch 'master' of https://github.com/Regalis11/Barotrauma 2018-04-24 22:19:33 +03:00
Joonas Rikkonen
fdcd34fc12 v0.8.1.0 2018-04-24 22:19:21 +03:00
Joonas Rikkonen
88eabef8af Made characterusable default to false (as it did before 91d6c7b) 2018-04-24 20:58:42 +03:00
Joonas Rikkonen
8cf26e2d7f Fixed null reference exception if a statuseffect removes an item when a round is not running. Closes #385 2018-04-24 18:02:53 +03:00
Joonas Rikkonen
91d6c7b91f Fixed explosives being directly usable by characters, causing them to explode when left clicking while holding them due to 9dd9425c. See #385 2018-04-24 18:00:36 +03:00