Commit Graph

1538 Commits

Author SHA1 Message Date
CHOMPStation2 bc3a18f164 Update projectile.dm 2020-07-18 18:22:04 -07:00
CHOMPStation2 36570c857a Runtime fix 2020-07-18 18:16:12 -07:00
izac112 22880f526d Voreupdate 2020-07-02 15:39:00 +02:00
Atermonera 69ac9d894f Merge pull request #7281 from Mechoid/BulletPenFix
Fix Penetrating Bullet Double-Jeopardy
2020-06-16 03:25:47 -04:00
izac112 0d1fe7d706 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-30 16:01:43 +02:00
Aronai Sieyes 39935255e4 VS: KHI rail pistol 2020-05-28 16:47:50 -04:00
Aronai Sieyes cff9440d2e Tweak railguns, add flechette pistol 2020-05-28 16:47:07 -04:00
izac112 be538243c1 various fixes 2020-05-27 22:43:33 +02:00
izac112 9bbc812fdf more touch ups 2020-05-25 15:53:16 +02:00
izac112 7339c768ea mag and round cleanup 2020-05-25 15:47:44 +02:00
izac112 2461737756 No idea why its called boxes 2020-05-25 15:31:11 +02:00
izac112 e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00
SplinterGP fcd2844540 nerfs charge cost and fire delay at taser mode 2020-05-21 15:49:12 -03:00
SplinterGP c270fd23a4 Removes unneeded code
Co-authored-by: Izac Joof Forsgren <izac10@live.com>
2020-05-21 12:41:46 -03:00
SplinterGP c2b89869f7 Adds olds style net gun back as a new one 2020-05-20 19:58:25 -03:00
Aronai Sieyes 09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
Izac Joof Forsgren ec13c2c57d Merge branch 'master' into izac-voreupdate 2020-05-16 09:02:59 +02:00
izac112 2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Teletubby2 dc64755e52 ok 2020-05-09 19:49:02 -04:00
Razgriz 95439574ae Recoil knockdown for micros 2020-05-08 21:36:21 -07:00
Razgriz 9a493e4ceb Recoil knockdown for micros 2020-05-08 21:33:10 -07:00
Razgriz 1b2695fde6 Recoil knockdown code for micros
From old chomp: https://github.com/CHOMPstation/CHOMPstation/pull/619

Code to make anyone under 50% take recoil damage (5 brute - your size * 2; so at 50% thats 5-1)
Also makes tinies fall down from firing guns.

First step in giving being a micro combat downsides for being so hard to hit.
2020-05-07 02:10:04 -07:00
Aronai Sieyes d172e2dd04 Cached version of icon_states() proc 2020-05-06 16:06:44 -04:00
izac112 e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
2020-05-06 21:53:03 +02:00
Atermonera 76177da0f9 Merge pull request #7072 from Mechoid/BrokenGunExamine
Fix Broken Gun Examining
2020-05-05 17:09:57 -04:00
Aronai Sieyes 7560ff2c5a Merge pull request #7644 from TeleTubby2/bazingabeamnatje
Adds Natje's Curabitur Cannon
2020-05-05 13:11:38 -04:00
Teletubby2 709619fc9a Back sprite. fixes.
rusty boooys
2020-05-05 11:26:10 -04:00
Killian 24b507ad9c scatter speedloader & box printing 2020-05-05 16:17:28 +01:00
Aronai Sieyes 1fb36dbcaf Bluespace Harpoon Tweaks
Random failure is lame, but so is removing gameplay.
2020-05-05 09:56:49 -04:00
Teletubby2 feb2f7da36 adds Natje's bazinga beam
I forgot how much gun code sucked.
2020-05-05 06:37:18 -04:00
Mechoid 7066d04df5 Explorer Expansion: New Horizons 2020-05-01 14:20:29 -04:00
Unknown 9c22a1847e More Gunbuster Fixes 2020-04-30 20:32:39 -04:00
Unknown 4dde4e4021 More Kisuke gun fixes 2020-04-30 20:12:11 -04:00
Aronai Sieyes 99fa98f437 Get your clicks out of my movement code 2020-04-30 15:40:41 -04:00
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
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
Repede e44e346352 Release Update
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate

# Conflicts:
#	code/__defines/machinery.dm
#	code/controllers/configuration.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/doors/blast_door.dm
#	code/game/machinery/pipe/pipe_recipes.dm
#	code/game/objects/items/devices/radio/radio_vr.dm
#	code/modules/client/preferences_vr.dm
#	code/modules/clothing/glasses/hud_vr.dm
#	code/modules/clothing/under/accessories/accessory_vr.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/gamemaster/actions/planet_weather_change.dm
#	code/modules/projectiles/guns/energy/netgun_vr.dm
#	code/modules/projectiles/guns/energy/protector_vr.dm
#	code/modules/vore/appearance/sprite_accessories_taur_vr.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm
#	icons/obj/power.dmi
#	vorestation.dme
2020-04-16 21:07:33 -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