Commit Graph

1284 Commits

Author SHA1 Message Date
Thunder12345 a9a97f5a81 Fixes for Merge Tokens (#18168)
* fixes #15649
fixes #16575

* oops forgot those lines
2016-06-03 14:46:42 -05:00
oranges 50c625a238 Merge pull request #18143 from lordpidey/Non_mobs_can_go_to_hell
Bolt of resurrection no longer runtimes on hitting non-mobs.
2016-06-03 09:10:27 +12:00
oranges 24056f9df3 Merge pull request #18146 from pudl/angela
Fixes smg magazines icon
2016-06-03 09:10:04 +12: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
Cheridan 835c35e79e Merge pull request #18111 from optimumtact/restinpeacekeeper
Removes peacekeeper borgs bolas
2016-06-02 02:25:33 -05:00
pudl 74a5ff30ad Another one bites the dust 2016-06-01 20:04:46 -05:00
Mike Long 2a464a3e42 Neatens code 2016-06-01 19:48:14 -04:00
Mike Long 5c6a2490af Bolt of resurrection no longer runtimes on hitting non-mobs. 2016-06-01 19:11:37 -04:00
TechnoAlchemist 6878e9fddb Adds luminosity to lasers and sparks. (#18090) 2016-05-31 21:18:09 -05: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
bawhoppen 1615e67e39 fixel projectiles (#18032) 2016-05-29 14:18:16 +02: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
Cheridan a43394278f Merge pull request #17963 from PKPenguin321/patch-5
removes duplicate definition
2016-05-27 20:51:33 -05:00
LatD 65a0027979 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-28 01:37:55 +03:00
Joan Lung 2cfb2d8eed Layers are now defines (#17949)
* Layers are now defines

* this looks better

* GAS_phil_LAYER

* no message

* remove the three unneeded defines

* no message
2016-05-27 22:16:21 +02:00
PKPenguin321 238971e1a8 removes duplicate definition
Fixes https://github.com/tgstation/tgstation/issues/17961
2016-05-26 17:34:40 -07:00
LatD 67190cb762 Fixes things found in testing 2016-05-26 23:30:42 +03:00
LatD a6680b9f06 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-26 19:02:46 +03:00
Jack Edge bc113b6aa2 Refactors NOREACT flag; minor cig refactor
The reagents datum now has its own flags, which currently includes
REAGENT_NOREACT, which functions in the same way. Shouldn't be touched
directly, use set_reacting(bool) to modify it, as modification also adds
or removes the reagents datum from the SSobj.processing list.

Also refactors cigs a little, adds a Destroy(), uses the open_flame()
proc for the hotspot exposure.
2016-05-26 10:12:59 +01:00
LatD f36237a67d Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-25 18:45:31 +03:00
LatD 907fc36e5c Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-24 22:17:44 +03:00
Jack Edge d29af3a94b Independent blobbernauts 2016-05-24 17:28:34 +01:00
Jack Edge afd9720abc Polymorph bugs, time since death, groundwork laid
🆑 coiax
fix: Fixes bug where bolt of change to the host would kill an attached
guardian.
fix: Fixes bug where bolt of change to laughter demon would not release
its friends.
fix: Fixes bug where bolt of change to morphling would not release its
contents.
fix: Fixes bug where bolt of change transforming someone into a drone
would not give them hacked laws and vision.
rscadd: Medical scanners now inform the user if the dead subject is
within the (currently) 120 second defib window.
/🆑

- Also laid the groundwork for force pushing ghosts back into bodies
when defibbing, along with standardising the ghost back into body
process.
- Defib limit and defib brain loss times are now #defines.
2016-05-24 17:28:34 +01: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 8865c15ebe Consistency path change 2016-05-21 06:59:20 +03: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
AnturK 4b426eccd1 Merge pull request #17698 from coiax/mehki-did-it
KA rebalance; brings back holding a satchel
2016-05-18 18:03:12 +02: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
Lularian d8af0ac003 pixel projectiles dream 2016-05-16 21:26:20 -05: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
phil235 dd2c91ca64 two tiny fixes (#17658) 2016-05-16 10:03:57 -05:00
phil235 a1a9a6585b Fixes projectile destruction breaking energy guns. 2016-05-14 16:31:17 +02:00
kevinz000 95ca999d44 FixesGrammer+otherstuff 2016-05-13 23:31:38 -07:00
kevinz000 a63f7c8ba9 woopsies2 2016-05-13 21:53:31 -07:00
kevinz000 de0d6b3172 woopsies 2016-05-13 21:51:56 -07:00
kevinz000 7895f0be9f Nerfs 2016-05-13 21:42:04 -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