Commit Graph

1062 Commits

Author SHA1 Message Date
AnturK 05b9307a09 Merge pull request #18335 from Fox-McCloud/experimental
Experimentor Fixes
2016-06-08 13:14:57 +02:00
Fox-McCloud 4ce47d1a6f Experimentor Fixes 2016-06-07 02:10:44 -04:00
oranges 744b722a12 Merge pull request #18241 from phil235/BloodRefactor
Blood refactor stuff
2016-06-07 10:09:35 +12:00
phil235 40a371296a Adding lizard blood pack in medbay storage's freezer crate.
Added a var/exotic_bloodtype to species, instead of hardcoding a lizard type.
Fixes proc for objects who should never be bloodied.
2016-06-05 18:12:08 +02: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 e13725b179 Refactors all (F) links into using a define
🆑
bugfix: Clicking the (F) link when an AI talks in binary chat will
follow its camera eye, the same as when (F) is clicked for its radio
chat.
/🆑

FOLLOW_LINK is a define that creates the clickable (F) link, so it
doesn't have to be typed painstakingly out every time we want to give
that link to an observer.
2016-06-03 15:29:28 +01:00
LatD d89eb178c6 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-30 18:33:55 +03:00
Joan Lung 325d8aa807 Merge pull request #17954 from GunHog/Head_Megaphones_100_Percent_Meme_Free
Head Megaphones + Megaphone changes
2016-05-28 10:40:31 -04:00
GunHog fc386b3b0c Megaphones fix
Megaphones now use say() instead of a custom override.
say() verb for living mods now accept spans as a third argument.
2016-05-26 17:54:46 -05:00
LatD 67190cb762 Fixes things found in testing 2016-05-26 23:30:42 +03: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 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
LatD 7d6b3e6847 origin and req lvl changes 2016-05-21 17:17:20 +03: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
Jack Edge 490dacf586 Fixes the other thing 2016-05-20 17:10:38 +01:00
Cheridan 23d8de67c9 Merge pull request #17445 from bgobandit/ayygentb
Adds BZ, a hallucinogenic gas. [MAP EDIT]
2016-05-19 18:14:18 -05:00
bgobandit d430ca29ab fixes the bugs of the jordie 2016-05-18 14:27:26 -04: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
bgobandit b94ce1968b Merge branch 'master' of https://github.com/tgstation/-tg-station into ayygentb
Conflicts:
	_maps/map_files/MetaStation/MetaStation.dmm
2016-05-18 03:13:37 -04: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
PKPenguin321 5cce6a6d50 eliminates a hard tell in microlaser desc (#17669) 2016-05-16 09:48:40 -05:00
bgobandit eaf93e34cd Merge branch 'master' of https://github.com/tgstation/-tg-station into ayygentb
Conflicts:
	_maps/map_files/MetaStation/MetaStation.dmm
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2016-05-15 17:19:14 -04:00
TechnoAlchemist 4705efa6da Adds new items to the mining vendors. (#17362)
* Adds new items to the mining vendors, also adds tracking implanter since that didn't exist before.

* woops

* Fixes tracking implants for miners, makes medipens not OD you on tricord.

* Actually doesn't OD on tricord now

* Chemical changes.

* Upgraded the jaunter into the wormhole lifebelt

🆑 coiax
rscadd: The Free Golems have developed the jaunter into the  wormhole
lifebelt, which automatically teleports the user when they fall in a
chasm or suffer a major medical emergency. Must be worn on the belt to work.
/🆑

Please don't mistake a random teleportation in crit for saving a user's
life, the Supply channel gets a notification, but suit sensors are
required to find them, and there's no guarantee the location picked is
safe (for example, the Toxins Test Site is a valid jaunt destination,
along with in the middle of the slime cages in Xenobiology).

* Adds modification kit.

* Golem ship now has its own /area

And a bluespace beacon.

* 5 tick medijaunt, no radio, golem jaunters + areas

The number of ticks before a medical emergency jaunt happens is now
five. No radio message is produced.

Free Golems now have no restrictions on what they can purchase. Wormhole
jaunters now specifically drop golems near their ship.

* Modkits remove the race restrictions from KAs.

* Buffs buffs buffs

I'd say something, but I'm sure I'd regret it later.

* Advanced lifebelts, golem superiority

* Removes modkit from minervendors, adds modkit to RnD!

* COMPILE DAMN YOU!!

* I made it compile

* Honor to my country, not to you :(

* fuck

* h-haha?

* Kor you know I would never actually ban you

* i could personally care less for HBls adminning style
2016-05-11 22:19:47 -05:00
LatD 24419a7c96 Final reliabilities 2016-05-12 02:59:59 +03:00
Robustin d1a2d1d0bd SLIP-SANITY (#17096)
* Chemo

* CHEMO

* Chemo

* Update growninedible.dm

* Corrected math

* decimals needs 0's

* NOW EVERYBODIES HAPPY YAYYY

* Updated Botany nerf

* Conflict correction & tweaks
2016-05-10 22:52:05 -05:00
bgobandit 8d1a1fe432 Merge branch 'master' of https://github.com/tgstation/-tg-station into ayygentb
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2016-05-10 01:14:44 -04:00
bgobandit 134b809fd1 scrubbers, human life.dm, map edits, etc 2016-05-09 18:04:20 -04:00
Joan Lung 85bc1ecb26 Merge pull request #17416 from coiax/pai-boot-noise
pAI card plays a noise when personality is loaded
2016-05-06 19:47:11 -04: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
Jack Edge 34afa1a98e pAI card plays boot_noise when personality loaded
- Added pai_boot.ogg sound file

https://www.freesound.org/people/jalastram/sounds/317638/

- Uses pai_boot.ogg noise when personality loads
2016-05-05 15:56:05 +01:00
Jordie 53fd10c54b Merge pull request #17256 from tgstation/revert-17086-planes_on_a_snake
Revert "Move some stuff from different layers to different planes"
2016-04-30 15:34:17 +10:00
Cheridan d662b0e455 Merge pull request #17218 from phil235/FixTalkingInPipes
No longer deaf while inside pipes
2016-04-29 20:34:03 -05:00
KorPhaeron 0bbcc00c4d Revert "Move some stuff from different layers to different planes" 2016-04-29 16:07:23 -05:00
phil235 750eaa4a57 invisibility = 100 and 101 now use defines. 2016-04-29 01:00:05 +02:00
phil235 d5af5ca696 Objects with invisibility = 101 are ignored by procs like view() that are used for say() and visible_message().
Objects that are simply hidden (instead of being abstract things) now always use invisibility = 100.
This fixes not being able to hear what you say while inside a hidden gas/disposal pipe.
Fixes the t-ray scanner revealing abstract object that should never be seen, like spacevine controller.
Fixes not hearing anything during a mob transformation.
2016-04-29 00:04:40 +02:00
MrPerson b50e0ee42c Merge branch 'master' of https://github.com/tgstation/-tg-station into planes_on_a_snake 2016-04-27 17:03:32 -07:00
Razharas 88b55ced87 Fixes chameleon projector explosion protection (#17138)
Fixes chameleon projector explosion protection
2016-04-27 17:31:54 +02:00
phil235 6eb4ffa825 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/items/devices/lightreplacer.dm
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-26 21:49:51 +02:00
kevinz000 de5a214132 Fixes detection multitool (#17011)
* detectionfix

* unnessacary_things_removal

* Uranges
2016-04-26 19:49:11 +02:00
Joan Lung ad9eec737f Merge pull request #17083 from coiax/ian-looks-very-fashionable-today
Refactors dog clothing
2016-04-25 11:46:44 -04:00
phil235 fcf544283d Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-24 21:22:37 +02:00
phil235 43e98079f1 Removing some comments I had left in. 2016-04-24 21:12:04 +02:00
phil235 0480790b0a Same things but with structures now. 2016-04-24 20:38:33 +02:00
phil235 0caa59b21a First commit of this big PR
These are the files with just tiny tweaks. Mostly modify an object's attackby so it does "return ..()" instead of "..()".
If there are other things in this commit, the PR's description will explain them.
2016-04-24 20:26:24 +02:00
Jack Edge 1927fc73e6 Dog fashion on the back 2016-04-24 14:40:08 +01:00
MrPerson 3f70f880ac Move some stuff from different layers to different planes
Moves everything on a 15+ layer to a plane. So now you get screen catcher (-99, was already on a plane), lighting (15), effects that ignore lighting (16), fullscreen UI effects (18), screen objects used to build the UI (19), actual equipment in the UI slots (20), and everything else (0).

Also created a file to contain plane and layer defines for hopeful eventual use.

Hopefully this doesn't change anything now but does enable some nifty new features in the future.
2016-04-24 04:03:41 -07:00