Commit Graph

669 Commits

Author SHA1 Message Date
oranges 0714a272f0 Merge pull request #18237 from coiax/fix-18236
KA now use the timer subsystem
2016-06-07 10:26:05 +12:00
oranges 744b722a12 Merge pull request #18241 from phil235/BloodRefactor
Blood refactor stuff
2016-06-07 10:09:35 +12:00
oranges e1055df57f Merge pull request #18235 from coiax/when-it-happens-we-will-know
[s] Makes winning a pulse rifle little more noticable
2016-06-06 01:33:12 +12:00
oranges cc99a4803c Merge pull request #18233 from kevinz000/gravitygunspleaseworkedition
Remake: Gravity guns
2016-06-06 01:19:08 +12:00
phil235 bd20c313b9 Merge branch 'master' of https://github.com/tgstation/-tg-station into BloodRefactor
Conflicts:
	code/__DEFINES/genetics.dm
	code/modules/mob/living/carbon/human/species_types.dm
2016-06-04 17:41:43 +02:00
phil235 b482764a19 - I made human/handle_blood() less shitty.
- We no longer leave a blood trail if blood_volume is below a certain level which depends on the brute damage received. This way dragging a wounded player does have a bad effect.
- We no longer give humans a second reagents var containing blood, and we don't put exotic blood in the mob's reagents. Now we don't store any blood substance inside the mob, we only have a blood_volume var. When we draw blood with syringe we create the reagent that match the type (blood reagent, or an exotic blood reagent)
- can't draw blood from mob if it's low on blood, so we can't empty a mob of its blood entirely.
- Removed the blood type preference appearing in character setting.
- blood pack automatically show blood type, unless manually labeled.
- removed bloody_hands_mob human var and same name glove var.
- Some animals now have blood (pets, goat, cows)
- hitting and dragging mobs with actual blood in their veins leaves blood on you and a trail on the floor.
- probably other stuff that I'll mention in the PR.
2016-06-04 17:33:16 +02:00
Jack Edge 57e921e4bd KA now use the timer subsystem
🆑 coiax
bugfix: Kinetic Accelerator reloading is less intensive for the server.
/🆑
2016-06-04 13:25:11 +01:00
Jack Edge 1453c4c089 Makes winning a pulse rifle little more noticable
🆑 coiax
rscadd: When someone wins a pulse rifle via arcade games, everyone dead
and admined are notified. Also it comes with a firing pin now.
/🆑
2016-06-04 12:22:37 +01:00
kevinz000 8b79a21698 why 2016-06-04 02:39:38 -07:00
kevinz000 4b2077fd6b fortheloveofallthatisholyworkplease 2016-06-04 02:30:38 -07:00
Lzimann dcc7d6d99e Fixes medbeam 2016-06-03 20:52:02 -03:00
Thunder12345 a9a97f5a81 Fixes for Merge Tokens (#18168)
* fixes #15649
fixes #16575

* oops forgot those lines
2016-06-03 14:46:42 -05:00
Razharas 9fdae2fe4e Merge pull request #17576 from LatD/Research
[Ready for test/merge] R&D level remake
2016-06-02 18:41:43 +03:00
oranges 5cbce38a55 Removes peacekeeper bola snare 2016-05-31 23:21:18 +00:00
LatD d89eb178c6 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-30 18:33:55 +03:00
oranges d3bcd231f8 Merge pull request #17998 from phil235/ShotgunSawoffFix
Fixes sawn off shotguns not showing the right sprite.
2016-05-30 10:55:42 +12:00
Lularian 8aa135f470 fixes some of the crap maybe 2016-05-28 11:08:46 -05:00
phil235 111259dae4 Fixes sawn off shotguns not showing the right sprite.
Moves some code around.
2016-05-28 17:45:42 +02:00
LatD 67190cb762 Fixes things found in testing 2016-05-26 23:30:42 +03:00
LatD 907fc36e5c Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-24 22:17:44 +03:00
AnturK 895406cd36 Merge pull request #17428 from Dahka/New_Syringes
Adds three new syringes
2016-05-24 17:37:40 +02:00
oranges ed80a9d1fd Merge pull request #17816 from Core0verload/fix_pack
Humble Fix Bundle
2016-05-24 09:26:03 +12:00
oranges 4dd328a9fa Merge pull request #17355 from kevinz000/KeepersOfThePeace
Peacekeeper Borgs
2016-05-23 12:32:06 +12:00
LatD 7d6b3e6847 origin and req lvl changes 2016-05-21 17:17:20 +03:00
oranges 1344474fb5 Merge pull request #17637 from Razharas/Minigun
Makes miniguns overheat on action
2016-05-21 22:58:45 +12:00
oranges 4348a9fb54 Merge pull request #17789 from coiax/fix-17782
Fixes #17782 and #17807; KA now can't be spam reloaded, spam improved
2016-05-21 22:50:26 +12:00
c0 1af2a4722c Humble Fix Bundle 2016-05-21 04:05:32 +03:00
Cheridan a046353c45 Merge pull request #17765 from Thunder12345/patch-1
Fixes combat shotguns
2016-05-19 10:28:04 -05:00
Jack Edge 7ed9a68689 Fixes #17782; KA now can't be spam reloaded
Fixes #17782.
2016-05-19 16:24:19 +01:00
LatD 502249831d Syndicate origin tech changes 2016-05-18 20:12:01 +03:00
Thunder12345 f60cfcf7a6 Fixes combat shotguns
Thank you Kor for unannounced and half assed nerfs by changing the magazine of the combat shotgun without updating the description or mentioning it anywhere
2016-05-18 14:30:42 +01:00
LatD fe76e64641 Origin tech changes and some fixes 2016-05-17 20:57:01 +03:00
Jack Edge 462aa7782a KA rebalance; brings back holding a satchel
Fixes #17203.

🆑 coiax
rscadd: Kinetic accelerators only require one hand to be fired, as before
rscdel: Kinetic accelerators recharge time is multiplied by the number of KAs that person is carrying.
rscdel: Kinetic accelerators lose their charge quickly if not equipped or being held
rscadd: Kinetic accelerator modkits (made at R&D or your local Free Golem
ship) overcome these flaws
/🆑

Effects on people who just use one kinetic accelerator: *They can now
carry a mining satchel in the off hand again.*
Effects on people who want to dual wield them both at once: They can do
this, but they recharge twice as slow, so no increase in DPS.
Effects on people who quasi-dual wielded by swapping them in and out of
the backpack: Now treated the same as dual wielders.

And as before, modkits mean you can properly dual wield KAs.
Mining cyborgs are unaffected.
2016-05-17 00:38:29 +01:00
kevinz000 a63f7c8ba9 woopsies2 2016-05-13 21:53:31 -07:00
Razharas 6fd4e33482 Typo fix and some balance
Typo fix and some balance
2016-05-13 22:20:49 +03:00
Razharas aaf30c5e1a Makes miniguns overheat on action
Makes miniguns overheat on action
2016-05-13 21:14:49 +03:00
paprika a45ea3293f Merge branch 'master' of https://github.com/tgstation/-tg-station into PixelProjectiles 2016-05-11 19:18:50 -07:00
Incoming5643 2368de554f Healing wand/staff regenerate limbs on use (#17532)
* Fully_heal regenerates limbs

* Working in the browser is such a bad idea

* Seriously not a great idea

* Don't do this at home kids
2016-05-11 19:27:18 -05:00
LatD e685d82805 Removing reliability 2016-05-12 02:43:18 +03:00
Nerd Lord da10d5c143 Adds healy glows to cult pylons and the medbeam gun 2016-05-09 19:37:15 -04:00
Jordie a406abfaa7 new sprites for tesla gun (#17509) 2016-05-09 11:40:32 -05:00
Cheridan 11af3176b9 Merge pull request #17472 from Core0verload/mini-egun
Adds miniature energy gun
2016-05-09 01:05:41 -05:00
Dahka 91b3a03421 Add change suggested by RemieRichards, change research costs again. 2016-05-08 20:27:39 -03:00
KorPhaeron b545bee480 Dual magazine shotgun (#17118)
* Dual feed shotgun

* Dual Shotgun Sprites
2016-05-08 13:44:33 +02:00
c0 9af58d7469 Adds miniature energy gun 2016-05-08 06:46:42 +03:00
paprika 9508b4699a fixes laser miniguns 2016-05-07 20:37:23 -07:00
Dahka e9a74db93a adds piercing syringe and design to protolathe 2016-05-05 21:45:38 -03:00
phil235 524a55a757 Merge branch 'master' of https://github.com/tgstation/-tg-station into Dismemberment
Conflicts:
	code/datums/martial.dm
	code/game/gamemodes/changeling/powers/fleshmend.dm
	code/modules/mob/living/carbon/carbon.dm
2016-05-05 21:57:10 +02:00
phil235 68da092009 Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior. 2016-05-05 18:17:51 +02:00
Cheridan 51466932c1 Merge pull request #17275 from Fox-McCloud/energy
Makes Shock Revolver Use Energy Projectiles
2016-05-04 15:16:39 -05:00