Commit Graph

4603 Commits

Author SHA1 Message Date
duncathan 7be382cd7f fixes ventcrawling; minor cleanup of a couple other things 2015-07-19 13:13:51 -06:00
Cheridan 97f9d909f1 Merge pull request #10606 from optimumtact/remove_singularity_for_teg
Remove the singularity from box and meta, replaced with TEG setups
2015-07-17 22:26:23 -05:00
Remie Richards 57b05f5a18 Merge pull request #10493 from phil235/SmokeFoamBuff
Foam&Smoke buff, some tweaks to sorium/ldm effect, plus some fixes.
2015-07-18 03:45:38 +01:00
Cheridan e4c8928de1 Merge pull request #10656 from phil235/DroneBuckleDropFix
Fixes buckled drones dropping what they're holding in their hands
2015-07-17 21:40:32 -05:00
Cheridan 4981cc19cb Merge pull request #10599 from RemieRichards/ChangelingBuffs
Changeling Buff
2015-07-17 21:35:03 -05:00
Cheridan 41890b2845 Merge pull request #10637 from phil235/ShowerBurnFix
Shower Fix
2015-07-17 15:34:29 -05:00
Cheridan ec2bd1d268 Merge pull request #10633 from phil235/DrinkingGlassPourFix
Some simple fixes
2015-07-17 15:22:20 -05:00
phil235 ed1d1c1919 Merge pull request #10620 from AnturK/mimic_fixes
Morph Fixes
2015-07-17 00:27:59 +02:00
AnturK f1a2385443 Morph Fixes 2015-07-16 21:50:11 +02:00
phil235 87cea3c58c Fixes buckled drones dropping the stuff they're holding in their hands. 2015-07-16 16:44:42 +02:00
phil235 3a93eeabba Merge branch 'master' of https://github.com/tgstation/-tg-station into DrinkingGlassPourFix
Conflicts:
	code/game/jobs/job/cargo_service.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/job.dm
2015-07-16 14:19:29 +02:00
phil235 3e9ab4e3c1 Merge branch 'master' of https://github.com/tgstation/-tg-station into SmokeFoamBuff
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/__HELPERS/unsorted.dm
	code/game/objects/items/weapons/tanks/watertank.dm
	code/modules/reagents/Chemistry-Recipes.dm
2015-07-16 14:09:12 +02:00
duncathan 8c2519e115 merge conflicts 2015-07-16 04:54:11 -06:00
duncathan ae417d2a03 Merge branch 'master' of https://github.com/tgstation/-tg-station into atmosrefactor2
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
	code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
	code/ATMOSPHERICS/components/trinary_devices/filter.dm
	code/ATMOSPHERICS/components/trinary_devices/mixer.dm
	code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm
	code/ATMOSPHERICS/components/unary_devices/Freezer.dm
	code/ATMOSPHERICS/components/unary_devices/cryo.dm
	code/ATMOSPHERICS/components/unary_devices/unary_base.dm
	code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
	code/modules/events/vent_clog.dm
	code/modules/mob/living/carbon/human/species.dm
	config/admins.txt
2015-07-16 04:27:25 -06:00
Firecage 4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
phil235 5a78777daf Changed carbon/clean_blood() to carbon/human/clean_blood() and moved it from carbon.dm to human.dm since it only did stuff for humans.
Fixes showers not being processed correctly, especially for mobs. (processing will a bit more intensive unfortunately)
Fixes showers not cleaning bloody human hands.
Remove the now unused checkeyes() proc.
2015-07-15 19:49:23 +02:00
phil235 ce101208a9 Fixes Satchel preference not working.
Also some simplification of the equip_backpack() proc.
2015-07-15 17:38:03 +02:00
phil235 49f55d312a Merge pull request #10545 from Miauw62/whyareallsecborgsshitlers
Adds a huge message to sec borgs telling them not to be shitheads.
2015-07-14 15:14:16 +02:00
phil235 4c859a9ef7 Merge pull request #10497 from AnturK/bagoffixes
Fixes teleport-swap
2015-07-14 14:30:05 +02:00
Cheridan 3ca900575e Merge pull request #10489 from Shadowlight213/BraindeadAI
Adds an examine message to braindead Ais
2015-07-14 00:33:51 -05:00
Cheridan c56a445037 Merge pull request #10580 from Ikarrus/bombarmor
Clothing with bomb armor are less likely to be shredded
2015-07-13 21:37:09 -05:00
Remie Richards 8a2ad87694 Lings now get to see the last 8 messages the person they absorbed said, to allow for better impersonations. 2015-07-14 03:20:39 +01:00
oranges 85e64ae7e0 Adds some more messages for braindamage gibbering 2015-07-14 13:18:40 +12:00
Remie Richards 6937076afe buffs to changelings:
* Changelings now regenerate chemicals while dead, up to half and ONLY HALF of their maximum storage (taking into account their storage upgrades, if applicable)
* Changelings now repair geneticdamage while dead, with the lowest value they can be taken to being 50, this number is arbitrary but was based on half the value at which fakedeath stops working for too much geneticdamage
* Changeling fakedeath timer is now halved, down from 80 seconds (1 minute 20 seconds) to 40 seconds.
2015-07-14 00:17:40 +01:00
phil235 72547af481 Merge branch 'master' of https://github.com/tgstation/-tg-station into SmokeFoamBuff
Conflicts:
	code/modules/mob/living/carbon/human/species.dm
2015-07-14 01:02:37 +02:00
Swag McYolosteinen c81d361273 Merge pull request #10143 from AnturK/ditto
Adds Morph - non-ling shapeshifter
2015-07-13 18:00:21 +02:00
Ikarrus c3ae39a7e8 Clothing with bomb armor are less likely to be shredded
Should have been this way from the start.
2015-07-12 14:42:07 -06:00
AnturK 4c3848f279 Changelog 2015-07-12 21:58:01 +02:00
duncathan 71ac607a6b Revert "merge conflicts?"
I fucked this up
2015-07-12 12:52:32 -06:00
duncathan 27f4bf3ee0 merge conflicts? 2015-07-11 19:56:54 -06:00
duncathan e074fb7856 makes air flow; fixes EVERYTHING 2015-07-11 18:45:19 -06:00
Cheridan 61d5425c3f Merge pull request #10503 from phil235/RevolverMisfireFix
Fixes for lighter, heart attack, defib, light fixture and other stuff
2015-07-11 19:01:04 -05:00
Cheridan 68c32438bb Merge pull request #10525 from phil235/FixFix1
Some fixes and stuff....
2015-07-11 18:06:29 -05:00
Miauw 03bf88bfba Adds a huge message to sec borgs telling them not to be shitheads. 2015-07-11 13:39:54 +02:00
duncathan 140bbd3972 3rd pass OOP
now we've got lists for parents, nodes, and air mixtures
(they're all broken)
moves tank.dm, cryo.dm, Freezer.dm to components/unary_devices/
2015-07-11 02:47:19 -06:00
phil235 7307079f8b Fixes stripping an item from someone not checking if the item is still there after the delay.
Same fix for pocket picking and removing embedded item.
Adding a warning message when trying to put an item on someone in the wrong slot.
Fixes loyalty implant message upon destruction being sent to wrong/dead people.
Fire on mob will now slowly be consumed (no more forever on fire corpse).
Some work on fire related proc.
Can't lit a mob on fire with a lighter that isn't lit.
Removing duplicate code in species.dm.
You can no longer heal your burns by ingesting clf3 and dousing yourself with water repeatedly.
simplified micro/macro explosive implant's timed explosion code.
2015-07-10 22:29:06 +02:00
Remie Richards f7faf4d730 Merge pull request #10487 from MrStonedOne/attacklogcleanup
Attack logging tweaks/cleanup
2015-07-10 18:42:08 +01:00
phil235 53a7b37a94 Modified detective revolver isn't deleted anymore when it misfires.
Heart attack: Moved heart attack var (and changed related code accordingly) from carbon to human since non humans have no use for it. I also added some feedback message when you recover from a heart attack.
Added a click cooldown on touching a light fixture.
burning yourself with a lighter now burns only the arm holding the lighter.
Fixes incorrect message when defibbing heart attack patient.
2015-07-10 00:18:35 +02:00
AnturK 2e9c4f3211 Fixes teleport-swap 2015-07-09 21:22:17 +02:00
phil235 d4cdd8eaa1 iron foam is now blue steel color just like aluminium foam.
Fixes metal foam from backpack firefighter watertank.
Fixes nanofrost not freezing shut vent scrubbers.
Atmos backpack watertank now starts full of water.
Change foam layer to Objlayer +0.1 so that it is above foammetalstructure so it doesn't hide the dissolving animation and also above tables.
Buff foam and smoke: smoke/foam contains four times the amount of reagents that was inserted in them, for balancing.
Add a little more smoke clouds for tear gas grenade.
Removed the no longer needed max_lifetime smoke var.
Reagent_dispensers (watertank) now show how much reagents they have left upon examination.
Fixed some code formatting in reagent_dispensers.
Fixes nanofrost temperature lowering effect that wasn't working.
Adjusted reagent volume in blob spore smoke because of the buff.
Change to sorium and ldm: effect varies with created volume.
If you are close to a powerful vortex you are thrown, otherwise you are just moved instead.
Vortex blobs now only make you step if you are far from it when reaction hits, otherwise it throws you. The vortex blob range gets +1 to compensate. Also the range and effect depends on the reagent volume which means lower effect for blobspore smoke.
2015-07-09 19:49:06 +02:00
Jordie 4928617c2b Merge pull request #10334 from xxalpha/jetbutt
Added ability for items inside items to have action buttons.
2015-07-09 20:51:29 +10:00
palpatine213 625410748d Adds an examine message to braindead Ais 2015-07-09 01:54:51 -07:00
MrStonedOne a262f9aac7 Attack logging tweaks
Removed the "feature" to have something log in an atom's vv attack log, but not the file attack log. all attack log items will go to the file as well as vv.

Replaced all hard coded src.name/name for attack log's object argument with an actual object (src) except where it made more sense not to.

All attack logging *should* happen AFTER damage is applied now.

Removed the confusing attack entry for when a changeling stings another changeling.

Tweaked how punch attack logs worked
2015-07-08 23:14:37 -07:00
Cheridan 2c3c8d7ae3 Merge pull request #10455 from Ikarrus/cyborgobjectives
Borging Antagonists
2015-07-08 17:40:01 -05:00
Swag McYolosteinen ca88306125 Merge pull request #10440 from MrStonedOne/patch-19
Utterly guts the player privacy poll.
2015-07-08 17:34:25 +02:00
MrStonedOne de7b8c3c30 Removes privacy poll, part7: newplayer.dm
I forgot about this part.
2015-07-08 08:24:06 -07:00
Ikarrus 4c4d1aaae4 Rewording 2015-07-07 20:37:07 -06:00
Ikarrus 3497744234 Makes it really obvious that antags no longer have objectives after being borged
Because people were confused by their memory being shown to them after the operation, which includes their objectives.
This also puts brains on a layer just above human mobs, so they can be seen when they pop out.
2015-07-07 15:11:53 -06:00
phil235 1a0f0469e9 Merge pull request #10376 from Perakp/simpleAnimalEmoteSpam
Fixes hostile animal emote spam
2015-07-07 20:22:31 +02:00
Cheridan c72c44bc18 Merge pull request #10426 from Ikarrus/shredreduction
Removes light blasts shredding clothes
2015-07-07 09:53:40 -05:00