Commit Graph

1633 Commits

Author SHA1 Message Date
phil235
7f5b01c932 Derp 2015-07-16 14:14:52 +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
phil235
e968c9e03c Fixes dog bed dropping metal on deconstruction.
Fixes damp rag smothering not giving a bold red message to the victim.
Fixes curare not properly weakening mobs.
2015-07-16 13:04:44 +02: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
Iamgoofball
33a8b288c8 haha wow totally forgot a tab 2015-07-15 06:24:40 -07:00
Iamgoofball
1e7ded7e81 Buffs the Bioterror Chem Sprayer
The Bioterror Chem Sprayer is a fun idea on paper, but the reagents in it are kinda shit. It's one of the least bought items because it's pretty useless.

It now has the following reagents:
Sodium Thiopental, for stamina and knockout
Coniine, for Toxin and Oxygen
Venom, for scaling Toxin, Brute, and Histamine Decay
Condensed Capsaicin, for an instant stun on application
Initropidril, for the heart attacks
Polonium, for the severe radiation

All in all, this should make the Bioterror sprayer actually worth the points investment, and make it more fun to use as an operative.
2015-07-15 06:18:46 -07:00
phil235
4763427154 Merge pull request #10559 from Ergovisavi/mediborg_annoyances
Makes the Mediborg Hypospray attack_self() behave like the Cyborg Shaker
2015-07-14 15:11:00 +02:00
phil235
1265d49b7c Merge pull request #10470 from Jordie0608/spessmensfourthwallistheceiling
Fixes ooc autotoggle and adds loc to sprayer log
2015-07-14 14:45:47 +02: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
phil235
b570af6795 Fixed catching banana creampie in mid throw (and similar objs). 3824 10536 (hitting a wall now makes the smashed pie effect appear ON the wall)
Moved last_bumped var from movable to living.
Renamed /obj/machinery/field/proc/bump to bump_field() to avoid confusion with Bump(). Same thing with /obj/effect/mine/Bumped() -> triggermine().
Fixes sprite when hunter leaps into a wall. 10428
Removed some commented code here and there.
Remove allow_spin var, throw_at now uses a spin argument for that.
Throwpass atom var is no longer used to check whether thrown stuff can pass stuff (now using CanPass() proc like everything else), the var is still used for some adjacency click check.
A thrown mob hitting another mob now produces a sound; also thrown mob and target one no longer swap places even on help intent.
A thrown mob now is lightly hurt (and weakened) if he hits a wall/mob/dense object. Nerf the damage when thrown mob hit wall.(20 -> 10)
Thrown obj/mob no longer bounces off wall unless it's no grav. Heavy thrown items now push an unanchored obj/mob target.
Fixes losing all momentum when getting out of a thrown closet. 6569
A lot of work on throw_at, throw_impact, and hitby to make the code more OOP. Thrown items no longer collide with border items on the side. 10479
Fixes the killer crusher. 10507
2015-07-14 00:51:19 +02:00
Cheridan
85148a12af Merge pull request #10504 from optimumtact/sanitycheques
Add sanity checks to syringe injection after the do_mob call
2015-07-12 22:11:35 -05:00
duncathan
71ac607a6b Revert "merge conflicts?"
I fucked this up
2015-07-12 12:52:32 -06:00
Ergovisavi
72da5e749e Inability to quickly select medicine as mediborg is super annoying, changes hypospray attack_self to be like the Borg Shaker, much easier. 2015-07-12 00:57:21 -07: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
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
Francis Devine
2800bca2d8 Add sanity checks to syringe injection after the do_mob call 2015-07-10 10:26:59 +12: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
phil235
8295f0c621 Blob vortex shouldn't throw /obj/effect 2015-07-09 20:19:11 +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
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
xxalpha
e0f2b93089 Merge remote-tracking branch 'upstream/master' into smoothballs
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-07-09 02:40:21 +01:00
Jordie0608
70ae3d2134 fixes ooc autotoggle and adds loc to sprayer log 2015-07-09 00:52:19 +10:00
Swag McYolosteinen
7e1abe68cb Merge pull request #10373 from kingofkosmos/beakerdrink
Drink spilling and beaker feeding
2015-07-08 13:06:15 +02:00
xxalpha
ab1227625f Merge remote-tracking branch 'upstream/master' into smoothballs
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-07-08 00:43:02 +01:00
xxalpha
5a5372ed96 Repathed carpet, and other shit I forgot. 2015-07-07 23:01:13 +01:00
Cheridan
c286b1710d Merge pull request #10360 from Perakp/cargoVirusEvent
New shuttle loan event + fixes
2015-07-07 07:42:08 -05:00
kingofkosmos
1c52df23b5 Merge branch 'master' of https://github.com/tgstation/-tg-station into beakerdrink
Conflicts:
	code/modules/reagents/reagent_containers/glass.dm
2015-07-05 10:14:33 +03:00
Ikarrus
588dcfebef More fixes and changelogs 2015-07-04 09:40:24 -06:00
Ikarrus
38dc0890c8 Spillable var instead of checking for OPENCONTAINER as that flag encompasses a lot more than necessary. 2015-07-04 08:54:04 -06:00
kingofkosmos
5c40d74aac Merge branch 'master' of https://github.com/tgstation/-tg-station into beakerdrink
Conflicts:
	code/modules/reagents/reagent_containers/glass.dm
2015-07-04 10:56:27 +03:00
kingofkosmos
46cab301fc Added splashing to drinking glasses. Added drinking and feeding to beakers. 2015-07-04 09:44:23 +03:00
Perakp
2b534cf5aa - Fixes shuttle loan events not bringing anything to the station. The objects created for the event were destroyed at Centcom.
- Removes supply order crates from shuttle loan events. These were pretty unintuitive, as you needed to accept the crates separately.
- Adds a new shuttle loan event: Centcom wants you to help in a virus research program. I feel this is a more controlled way of bringing diseases on the station compared to the disease outbreak event.
- Fixes camera failure event
- Fixes spanish flu, adds spanish flu culture bottle
2015-07-04 01:46:50 +03:00
Ikarrus
4d1760ca74 Fixes Beakers unable to transfer their reagents to other objects the mob is holding. 2015-07-02 21:30:01 -06:00
Razharas
572121ecc4 Merge pull request #10244 from Ikarrus/workplacesafety
Workplace "Accidents"
2015-07-03 05:05:36 +03:00
Ikarrus
8f8164d8e8 Removed atom var and instead used paramaters to determine the thrower 2015-07-02 19:57:51 -06:00
kingofkosmos
4af6c0b466 Added drinking glass splashing. Added beaker drinking and splashing which doesn't work at this moment. 2015-07-02 21:26:41 +03:00
Ikarrus
55bec2d24d Adds a thrownby var that's used by admin logging. 2015-07-01 13:00:12 -06:00
Ikarrus
07bf0fd953 You can splash yourself with reagent glasses now 2015-07-01 12:01:58 -06:00
xxalpha
cfb5e724b6 Material container, all items can have materials, wake me up
cant wake up

go to sleep debug
2015-07-01 03:34:47 +01:00
Cheridan
3329970b55 Merge pull request #10266 from phil235/SpaceDrugOverdoseTweak
Tweaks space drug overdose and space drug blob effect.
2015-06-30 11:02:15 -05:00
Cheridan
604bcdef68 Merge pull request #10206 from Dorsisdwarf/smokeforyourhp
Buffs capacity of cigars to be greater than cigarettes, removes fucking stupid messages from nicotine.
2015-06-29 22:20:51 -05:00
Ikarrus
5792e7ccd9 - Swaps floor throwing and distance throwing
- Reagent containers thrown by bartenders will never spill if it doesn't collide into anything
2015-06-29 19:31:18 -06:00
Dorsisdwarf
1f2e672f24 Remember kids: Smoking makes you RUGGED 2015-06-29 21:36:16 +01:00
phil235
f1cd3069ad Tweaks space drug overdose and space drug blob effect. 2015-06-29 18:05:39 +02:00
phil235
a8bc78e16e Merge pull request #10125 from Iamgoofball/patch-85
Buffs the traitor toxins
2015-06-29 17:36:11 +02:00
Ikarrus
8c1fde7947 Squashed Commits 2015-06-28 22:38:55 -06:00