Commit Graph

742 Commits

Author SHA1 Message Date
Aronai Sieyes b3c1cfd29d Merge pull request #7516 from VOREStation/upstream-merge-7045
[MIRROR] Removes limits on eating, centralizes nutrition changing.
2020-04-29 19:23:55 -04:00
Aronai Sieyes 874baa1d2d Merge examine refactor for vorestation 2020-04-29 17:49:54 -04:00
Atermonera f1cabd6742 Removes limits on eating, centralizes nutrition changing. 2020-04-29 17:15:15 -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
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
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
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
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
Atermonera cd10c54d5c Merge pull request #6834 from Mechoid/RIGFixes
Fix various RIG issues
2020-03-17 01:06:31 -04:00
Mechoid 487c39eab8 Antag Uplink Expansion 2020-03-17 00:23:20 -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
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
Atermonera 55704e0760 Merge pull request #6729 from Mechoid/RailgunFixxo
Fix and tweak station Railguns.
2020-02-24 16:15:04 -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 47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Mechoid c3079004ea GameMaster Tuning (#6593)
* Actually Game Master but I am an idiot.
2020-01-05 01:39:28 -05:00
Mechoid 99bc3dcdbc Security / PseudoCargo Expansion 2019-11-24 17:23:48 -05: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
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
Atermonera f519272525 Merge pull request #6290 from Mechoid/SubMunitions
Adds Submunition projectiles, and a laser gun showcasing them.
2019-07-23 23:35:05 -04:00
if there were two guys on the moon d5f380984f Medbeam 2019-06-29 20:04:47 +01:00
ElectricB1ue d9ebf54db0 Adds two new alternate sprites for the detective's revolver. (#6230)
* Adds the sprites

* This should do things.
2019-06-28 21:23:42 -04:00
Heroman3003 e3e715454b Makes placeholder entries for lore writing 2019-04-23 11:13:42 +10:00
Neerti f8c9664178 Explorer Update - Cataloguers 2019-03-30 16:19:24 -04:00
Unknown 3aa0fdfda5 Removes conductive flags from VR stuff 2019-03-28 21:45:38 -04:00
Neerti 30b967e28a Items are now assumed to be conductive, rather than the opposite 2019-03-28 21:45:38 -04:00
Novacat 7a518bc619 Merge branch 'master' into upstream-merge-5944 2019-03-28 19:19:44 -04:00
Spades a184e67c93 Changes (R&D made) Saber SMG to Advanced SMG 2019-03-28 18:22:23 -04:00
Novacat 04c5080426 Merge pull request #4755 from VOREStation/upstream-merge-5940
[MIRROR] Fix a div/0.
2019-03-28 17:39:34 -04:00
Novacat a98ac52678 Merge pull request #4750 from VOREStation/upstream-merge-5886
[MIRROR] Introduces caseless ammo, and a caseless rifle
2019-03-28 16:40:13 -04:00
Novacat 81d698b94c Merge pull request #4643 from VOREStation/upstream-merge-5790
[MIRROR] Drop the number of shots of normal and sec-xeno tasers back down to 5.
2019-03-28 15:48:47 -04:00
Novacat a4919caba2 Merge pull request #4719 from VOREStation/upstream-merge-5636
[MIRROR] [READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work
2019-03-28 14:52:51 -04:00
Novacat 15dac0304f Merge pull request #4724 from VOREStation/upstream-merge-5877
[MIRROR] Unfucks Vintage Rifle
2019-03-28 14:42:43 -04:00
Novacat 741931aa31 Merge pull request #4723 from VOREStation/upstream-merge-5906
[MIRROR] Gives the auto shotgun a new sprite
2019-03-28 14:42:10 -04:00
Unknown cf39c61c2d Conflict Resolution
This one made a lynx cry.
2019-03-28 13:19:19 -04:00
Neerti 3256202407 [READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work 2019-03-27 22:02:07 -04:00
Novacat 1e5b351f43 Merge pull request #4711 from VOREStation/upstream-merge-5875
[MIRROR] Tommygun now Tommy Gun
2019-03-27 20:45:46 -04:00
Unknown 1e45296d31 Conflict Resolution 2019-03-27 10:58:53 -04:00
Spades eb0e2ec1f5 Guns sounds refactor and improvements 2019-03-27 10:42:18 -04:00