Commit Graph

36946 Commits

Author SHA1 Message Date
Leshana
997204960c Spawn statistic_cycle off to not sleep SSticker. 2020-04-13 17:38:12 -04:00
Aronai Sieyes
9b3f19f51f Merge pull request #7235 from VOREStation/aro-talontweaks
Various little Talon tweaks and fixes
2020-04-13 15:47:46 -04:00
Aronai Sieyes
2e62158884 Make more turfs blend 2020-04-13 15:04:36 -04:00
Unknown
4238aabcb8 Fixes broken netgun sprite 2020-04-13 13:41:56 -04:00
Aronai Sieyes
d5d0d98163 Merge pull request #7232 from VOREStation/aro-talonpref
Talon job pref saving
2020-04-13 11:31:56 -04:00
Aronai Sieyes
e3a6def6f7 Remove cursed file 2020-04-13 11:18:39 -04:00
Aronai Sieyes
9368dd2736 Talon job pref saving 2020-04-13 11:05:27 -04:00
Unknown
5468301dc5 Ports Polaris 6992 and some Urist backpacks
- Reenables Dual Wielding penalties on most heavy guns.
- Adds wielded sprites for all weapons with dual-wield penalties.
- Ports a ton of gun sprites from Urist McStation
- Removes mention of requires_two_hands in code since that is not used anymore.
- Adds some Urist mcstation backpacks (VS only)
2020-04-13 10:40:24 -04:00
Aronai Sieyes
68b527b518 Merge pull request #7222 from VOREStation/aro-shieldbeep
Make shield sprites look nicer hopefully
2020-04-13 10:05:27 -04:00
Aronai Sieyes
b1bf1a7e93 Merge pull request #7211 from VOREStation/vplk-shuttle-construction
Ship/Shuttle Console Construction
2020-04-13 10:01:56 -04:00
Aronai Sieyes
074116fa7c Merge pull request #7212 from Novacat/nova-pathfinder
Gun Refactors and Changes
2020-04-13 09:45:37 -04:00
H0lySquirr3l
5bc18c4c96 Replace ring in holo boxing ring with actual ring. (#7209)
* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Delete fitness_vr.dmi

* Add files via upload
2020-04-13 09:33:22 -04:00
Aronai Sieyes
d9b3739669 Merge branch 'master' into vplk-shuttle-construction 2020-04-13 09:30:05 -04:00
Aronai Sieyes
a7590e81a9 Merge pull request #7210 from VOREStation/aro-shuttleiocn
Changes shuttle landing soon warning
2020-04-13 09:28:53 -04:00
Aronai Sieyes
0d39c5535e Merge pull request #7200 from VOREStation/aro-offmap-rebase2
ITV Talon offmap spawn jobs
2020-04-13 09:28:19 -04:00
Novacat
2c1030b3e6 Merge pull request #7224 from VOREStation/upstream-merge-6878
[MIRROR] A Tale of Blobs and Man
2020-04-13 08:14:41 -04:00
Novacat
ee4ca5aa52 Update spore.dm 2020-04-13 07:31:19 -04:00
Novacat
84dfedd34c Merge pull request #7223 from MrSign/kittywhitelist
Adds K't's fishing rod whitelist
2020-04-13 07:29:57 -04:00
Novacat
7b66fa010d Merge pull request #7227 from VOREStation/upstream-merge-6986
[MIRROR] Fix manifold and manifold4w underlay rendering.
2020-04-13 07:29:18 -04:00
Atermonera
5308c2a6b3 Merge pull request #6989 from VOREStation/pol-blast
Random blast door fix
2020-04-13 02:22:26 -04:00
Atermonera
714dce67c3 Merge pull request #6986 from VOREStation/vplk-fix-manifold-underlays
Fix manifold and manifold4w underlay rendering.
2020-04-13 02:19:08 -04:00
Atermonera
2374a40908 A Tale of Blobs and Man 2020-04-13 01:35:01 -04:00
MrSign
0da3c94d09 Update loadout_fluffitems_vr.dm 2020-04-13 13:14:19 +10:00
Aronai Sieyes
a727b703b6 Merge pull request #7207 from Runa-Dacino/Horned-elves
Adds new ear options
2020-04-12 23:00:40 -04:00
Aronai Sieyes
a8402f0df1 Merge pull request #7216 from VOREStation/upstream-merge-6966
[MIRROR] Refactor away area/New()
2020-04-12 22:56:50 -04:00
Aronai Sieyes
b28f08de4d VS: NIF crew monitor update 2020-04-12 22:53:18 -04:00
Aronai Sieyes
2097e329ac Add some wall types 2020-04-12 22:53:09 -04:00
Aronai Sieyes
4e0a62996b Add nav console modular program and fix crew mon bug 2020-04-12 22:52:57 -04:00
Aronai Sieyes
984415e9c9 Merge pull request #7177 from VOREStation/sscleanup/openspace
Refactor the Open Space controller into MC Subsystem
2020-04-12 21:55:20 -04:00
Leshana
5a6d7f9184 Fixes and bubble shield visuals support. 2020-04-12 21:02:45 -04:00
Aronai Sieyes
ba20f079f2 Fix startends 2020-04-12 20:51:07 -04:00
Aronai Sieyes
3a41cf0656 Make shield sprites look nicer hopefully 2020-04-12 20:51:07 -04:00
Leshana
865303e481 Removed area.uid var and /area/New()
- var/uid was used in only a handful of places.  Because areas are singletons
  it is safe to replace the uid with \ref, areas don't get deleted.
- And with that /area/New() is empty, we can remove it!
2020-04-12 18:05:09 -04:00
Leshana
262faa38e4 Replace global all_areas list with world.
It ends up having similar performance, so might as well not bother with all_areas.
2020-04-12 18:04:54 -04:00
Leshana
859036b7cd Merge pull request #7176 from VOREStation/vplk-glass-firedoors
Make glass firedoors constructable/deconstructable.
2020-04-12 11:51:46 -04:00
Runa Dacino
4c612bda81 Switches "Yes" and "no" for Request spice
https://github.com/VOREStation/VOREStation/issues/7133

states that it's very easy to accidentally press yes using the current layout.
2020-04-12 14:31:44 +02:00
Unknown
37fe76a1bb Better coad 2020-04-12 06:05:51 -04:00
Atermonera
83c1a512e2 Adds pref to toggle vchat without 60s wait for linux users (#6980) 2020-04-12 00:51:57 -04:00
Novacat
57a78c5e72 Update mapping_helpers.dm 2020-04-11 23:49:58 -04:00
Atermonera
92792fd0dc Adds airlock setup helpers 2020-04-11 23:49:15 -04:00
CRTXBacon
b1dde97d98 Add files via upload 2020-04-12 02:05:14 +01:00
CRTXBacon
c78ffd954e Add files via upload 2020-04-12 02:04:18 +01:00
Leshana
ea4e928519 Adds a "champagne bottle" to dynamically create landable overmap ship shuttles in-game. 2020-04-11 19:54:07 -04:00
Leshana
4d9cc39664 Make shuttle control consoles constructable.
- Adds circuit boards for shuttle consoles. (Ferry, Multi, and Overmap).
- Deconstructing a console saves the linked shuttle tag in the board for when it is re-constructed.  New boards start blank but will auto-link if you build the console on a shuttle.
- Boards know what type of shuttle they can control and will only auto-link with a shuttle if it is the appropriate type.

Note: By default the only mapped-in shuttle consoles that are deconstrutable are overmap and multi shuttle consoles.   For any others, consoles built mid-game will be deconstrutable but the mapped-in ones will not.  That way the arrival, escape, supply ferry shuttles etc won't be messed with unless the mapper specifically chooses to override and make them that way.
2020-04-11 19:54:03 -04:00
Unknown
323d5f838b Gun Refactors and Changes
- The Protector is now a minature energy gun, it has 3 lethal, 6 standard stun, and no special stun shot anymore. It retains the alert level lock, there is a version without the lock.
- The energy net gun now gets 3 net shots, but loses its stun alternate fire. It also gets a new sprite from baystation.
- Refactors all Vorestation weapons in vore/fluffstuff to be in their appropriate directories.
- Removes all personalized custom weapons.
- KHI is no longer the manufacturer for the Protector, Net Gun, and AR Glasses. I wanted to make KHI a bit rarer, and their specialty mainly ultra high tech equipment.
- Refactors Expedition Phasers. No practical change, but now there are unlocked versions of all three phaser variants.
2020-04-11 19:39:49 -04:00
Leshana
65546d4e28 Merge pull request #7150 from VOREStation/sscleanup/ticker
Refactor the gameticker controller into SSticker
2020-04-11 19:28:37 -04:00
Aronai Sieyes
6ec7ad58d0 Changes shuttle landing soon warning 2020-04-11 18:18:27 -04:00
Leshana
13d4144bc1 Add feedback to user if successful when reconnecting ship computers to ship. 2020-04-11 18:13:19 -04:00
Leshana
f23af78ae9 Setup auto-configuration of shuttle consoles.
- Its now possible to put shuttle consoles on a shuttle without a specific subtype or mapediting the shuttle_tag on them.
- After shtutle initialization, SSshuttles gives each initialized shuttle the chance to scan its areas for consoles it wants to claim and configure.
2020-04-11 18:13:19 -04:00
Leshana
bd2a734bc3 Add circuitboards to make overmap ship computers constructable. 2020-04-11 18:13:18 -04:00