Commit Graph

1387 Commits

Author SHA1 Message Date
Aronai Sieyes
874baa1d2d Merge examine refactor for vorestation 2020-04-29 17:49:54 -04:00
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Unknown
47e2e1a2e4 Removes duplicate var 2020-04-27 17:12:41 -04:00
Unknown
356fe4fced Fixes Kisuke's gunsword 2020-04-27 17:10:59 -04:00
Aronai Sieyes
d8cc52070a Merge pull request #7469 from Natje0/master
Removes Healrod due to MISTAKES MADE and new ideas
2020-04-26 18:56:58 -04:00
Natje0
85b1d7fb2b Removes Healrod due to MISTAKES MADE
I managed to push the wrong sprite sets. This one's nearly impossible to see the charge meter of, and is just... Obnoxious.
Additionally, I've got new plans of how to make this darn thing, and thus I'm scrapping this project in favor of a new one! Thiiink I got all of them.
2020-04-27 00:37:05 +02:00
Aronai Sieyes
d3da6ae4a5 Refactor move code 2020-04-26 16:42:50 -04:00
Natje0
c488039c32 Adds the Healrod, atm just a resprite (#7359)
* On-back healrod

* Left hand

* Right hand

* Gun icon

* Adds the Healrod (unfinished code)

All credits to zapzapper

* Fixes wrong directional sprite

* Makes healrod just a retextured ML3M... for now.

* Update code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m.dm

Co-Authored-By: Aronai Sieyes <arokha@arokha.com>

Co-authored-by: Natje0 <Natje0@users.noreply.github.com>
Co-authored-by: Aronai Sieyes <arokha@arokha.com>
2020-04-24 21:06:39 -04:00
Atermonera
2411a19038 Merge pull request #7023 from Mechoid/FixAndTweakRoiling
Roiling Mold Blob Fix/Tweak
2020-04-22 15:53:57 -04:00
Arokha Sieyes
b355af8ae4 Fix frontier phaser lock locations 2020-04-22 02:09:12 -04:00
Unknown
4238aabcb8 Fixes broken netgun sprite 2020-04-13 13:41:56 -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
074116fa7c Merge pull request #7212 from Novacat/nova-pathfinder
Gun Refactors and Changes
2020-04-13 09:45:37 -04:00
Atermonera
2374a40908 A Tale of Blobs and Man 2020-04-13 01:35:01 -04:00
Unknown
37fe76a1bb Better coad 2020-04-12 06:05:51 -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
Unknown
9f2d3f522d Ports Sniper Rifle QOL from Polaris 2020-03-29 21:36:27 -04:00
Unknown
db87175163 Earlyport Fixes 2020-03-20 13:50:44 -04:00
Novacat
fb33bde693 Merge pull request #6896 from VOREStation/upstream-merge-6834
[MIRROR] Fix various RIG issues
2020-03-17 01:15:18 -04:00
Atermonera
cd10c54d5c Merge pull request #6834 from Mechoid/RIGFixes
Fix various RIG issues
2020-03-17 01:06:31 -04:00
Atermonera
101c9c33c5 QoL: Projectiles 2020-03-17 00:55:56 -04:00
Mechoid
487c39eab8 Antag Uplink Expansion 2020-03-17 00:23:20 -04:00
Atermonera
8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
Atermonera
ecd37a0c71 Merge pull request #6781 from Mechoid/RailgunTweakening
Tweak Station-Railguns
2020-03-13 17:16:17 -04:00
Atermonera
e45a95d365 Robotics Expansion: RIG-ged and Ready 2020-03-11 15:56:18 -04:00
Mechoid
acc712e1d5 Exosuit Expansion: Return of the Ripley 2020-03-08 00:52:32 -05:00
Novacat
6e23c5f45a Merge pull request #6709 from VOREStation/aro-mistake
Fix way too many vorestation edits
2020-03-05 19:03:58 -05:00
Novacat
b44f8e0911 Merge pull request #6592 from VOREStation/vchat-rebase
VChat: Redone chat output in Vue.js
2020-03-01 10:51:29 -05:00
Aronai Sieyes
f475ecbdc6 Replace a bunch of VOREStation edits that can be sent to Polaris 2020-02-29 19:45:58 -05:00
Atermonera
55704e0760 Merge pull request #6729 from Mechoid/RailgunFixxo
Fix and tweak station Railguns.
2020-02-24 16:15:04 -05:00
Atermonera
11eed81b92 Ports precision placement of items 2020-02-22 02:35:41 -05:00
Arokha Sieyes
d5b820fc58 VChat: Redone chat output in Vue.js
Co-authored-by: Leshana <Leshana@users.noreply.github.com>
2020-02-19 19:55:01 -05:00
Arokha Sieyes
7f1aabbf25 Weird cases where to_chat freaks out 2020-02-12 19:38:45 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Atermonera
aaf71ecbbf Merge pull request #6615 from Shadow-Quill/Ion-Fix
Fixes ion proj not EMPing when hitting walls
2020-01-15 23:10:55 -05:00
Mechoid
c3079004ea GameMaster Tuning (#6593)
* Actually Game Master but I am an idiot.
2020-01-05 01:39:28 -05:00
Atermonera
3b7a737c08 Change various global species lists to GLOB versions, adds 2 more event subspecies. 2019-12-16 00:52:29 -05:00
Mechoid
99bc3dcdbc Security / PseudoCargo Expansion 2019-11-24 17:23:48 -05:00
Unknown
9d7c9714f3 Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin 2019-11-15 12:12:55 -05:00
Atermonera
a45472b446 Update Chat System to use to_chat(src, "") instead of src << "" 2019-11-05 19:22:38 -05:00
Heroman3003
a3fb3e3950 Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin 2019-10-29 09:33:48 +10:00
Novacat
6b2c7cc29a Update energy.dm 2019-10-21 19:54:30 -04:00
Mechoid
169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
Atermonera
93bbae11e7 Merge pull request #6475 from R1f72r/Phoronboreupgrade
Allows you to upgrade Phoron Bore with manipulators
2019-10-08 04:22:06 -04:00
Atermonera
89aad128cf Blind port of Bay Radiation Subsystem 2019-10-06 03:30:36 -04:00
Atermonera
6e4fc794d6 Merge pull request #6467 from Heroman3003/datum-timer-beam
Makes every single shot not create ~40 timers but 1
2019-09-27 16:07:25 -04:00
FelixRuin
93cf2d41e1 fix gun handle_suicide 2019-09-21 15:01:55 +03:00
Unknown
aa2a3682b9 Merge remote-tracking branch 'VOREStation/master' into medbeam 2019-08-31 15:32:22 -04:00
Andrew
69ed422019 Adds Laser Tag Turrets Plus Changes (#6324)
* Adds Laser Tag Turrets

* Adds changelog

* Reverts Lethal Turrets Shooting to Kill

* Small No Longer Means Misc Life

* Revert "Merge branch 'master' into Turret"

This reverts commit 0300e6723b1aec0c47f8f82f7db770aa29af2483, reversing
changes made to 219348783d49b3205c3ed64bdd604f61791e6e72.

* Revert "Revert "Merge branch 'master' into Turret""

This reverts commit ca3d13b3372f2c5587d8d2cc449a6da8503494e4.

* Github why

* Change laser.dm to master?

* Revert "Change laser.dm to master?"

This reverts commit da562f6bc1ec43fe0cf5fe6ec5af61ada3474dd9.
2019-07-27 15:45:58 -04:00
Novacat
3fcc7e1465 Merge pull request #5500 from VOREStation/upstream-merge-6285
[MIRROR] Adds the SLED.
2019-07-24 06:24:34 -04:00