Commit Graph

1496 Commits

Author SHA1 Message Date
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
0073ffc45d naming 2016-06-04 02:45:43 -07:00
kevinz000
e8ddb7a4d7 why the fuck 2016-06-04 02:44:25 -07:00
kevinz000
8b79a21698 why 2016-06-04 02:39:38 -07:00
kevinz000
607c4be5f9 hjope this works 2016-06-04 02:38:07 -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
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