Commit Graph

488 Commits

Author SHA1 Message Date
tkdrg 6bebbb67b3 Merge pull request #13559 from bgobandit/emptysyringes
Empty syringes no longer appear to have a fill.
2015-12-17 17:18:13 -03:00
bgobandit fd94cbdad2 uses Clamp() now 2015-12-17 14:39:13 -05:00
KorPhaeron a5fb122f49 The Mulligan
A syringe which completely randomizes your name and appearance.
Traitor only, and in the spy bundle.
2015-12-17 00:14:18 -03:00
bgobandit b4270d862d Empty syringes no longer appear to have a fill. 2015-12-10 16:47:20 -05:00
AnturK e36853d7c9 Convert bots to simple animals - Updated 7.0 2015-11-26 22:06:07 +01:00
Razharas 389f4e3779 Fixes bloodpacks
Fixes bloodpacks
2015-11-17 01:10:41 +03:00
Razharas fd531118f4 Merge pull request #13037 from bgobandit/bloodlabels
Adds the ability to label blood packs.
2015-11-17 01:07:06 +03:00
bgobandit 4dee16a13d canusetopic for ayyranclmaos 2015-11-16 16:53:19 -05:00
bgobandit f01fd1f942 Adds the ability to label blood packs. 2015-11-15 16:45:43 -05:00
Mike Long b1ea1c698f Adds new reagent application method, INJECT. This will hopefully prevent people from thinking they shouldn't have eaten Styptic powder after being injected with it.
Also, as a side effect, fixes #9305 for itching powder, but if the problem still exists for other chemicals, then it's still around.
2015-10-27 18:51:07 -04:00
Razharas f87d72571e Merge pull request #12420 from phil235/TransferAmountChange
Set Transfer Amount for reagent containers now uses attack_self() instead of object verb
2015-10-17 18:06:39 +03:00
phil235 dce2027d01 Changing the transfer amount of all reagent containers (beaker, bucket, glass) is now done by clicking them, similar to spray. Reagent dispensers (watertank, fueltank, pepperspray dispenser) no longer have their own transfer amounts and use the reagent container's transfer amount instead (except for sprays which get 50u for faster refilling).
Removed object verb "Set Amount per transfer from this" for both reagent containers and reagent dispensers.
2015-10-16 01:07:10 +02:00
Xhuis 713a0b99ef Buffs melee resistance on the TACTICAL BUCKETS 2015-10-14 21:58:15 -04:00
Xhuis 14c21cf2a2 Allows you to equip buckets as hats 2015-10-14 21:51:42 -04:00
Razharas 34f1552eb5 Merge pull request #12199 from Aranclanos/hypomedborg
Fixes medborgs injecting mobs without reagents with their hypospray
2015-10-10 03:17:11 +03:00
phil235 832e650ffc Trashbag can pick up ammo casings and reagent_containers/food/drinks again.
Dipping a lit cigarette into a reagent container heats up the liquid (like every other heat sources) and only unlit cigarette can be dipped to absorb the liquids now.
2015-10-08 01:26:55 +02:00
Aranclanos 3f0731fab3 Fixes medborgs injecting mobs without reagents with their hypospray 2015-10-06 15:31:01 -03:00
Xhuis 40918f93c5 Fixes a small issue with Syndicate mediborgs 2015-10-02 15:53:21 -04:00
Razharas 3bf8ae1f1a Merge pull request #12057 from Xhuis/it_worked_in_testing_3
Fixes and tweaks to Syndicate medical cyborgs
2015-09-30 23:14:58 +03:00
Razharas 1aa0e911ae Merge pull request #11760 from Core0verload/selfrepair
Cyborgs update
2015-09-30 22:50:08 +03:00
Xhuis 129b7b9b2f Fixes & tweaks 2015-09-27 23:27:18 -04:00
c0 feeb9ff7d2 Organs update 3 2015-09-25 22:26:15 +03:00
c0 a687b07eac f u c k c o n f l i c t s 2015-09-25 14:35:44 +03:00
xxalpha 655b1a77c7 Replaced refactored is_hot() to be an atom proc. 2015-09-24 01:12:38 +01:00
Xhuis 6711406d6a Conflicts 2/3 2015-09-22 16:37:00 -04:00
Xhuis 4a34f42a0a Give Syndiborgs more stuff 2015-09-20 14:38:25 -04:00
phil235 f90ee4aa8c - Fixed monkey starting with no dna.
- Fixed bugs with monkeyize/humanize: 7803 (humanized monkey nobloodtype)
- Fixes 9298 monkeyed ling have troubles humanizing themself (already fixed?)
- Fixes despawning clothes when monkeyizing. 11855
- Replaced check_dna_integrity proc by simpler has_dna proc when required.
- created set_species() proc
- fixed space retrovirus not transfering SE (despite having a domutcheck()). Still need to check if it needs a name = real_name.
- I renamed mecha/var/dna to dna_lock to avoid confusion
- I renamed an armor var in a species proc to armor_block to avoid confusion with species/var/armor.
- I removed many if(dna) checks in lots of files.
- I removed duplicate defense procs between human/proc/X and dna.species/proc/X since dna is now always set.
- Anatomic panacea from changeling removes alien embryo correctly. 6247
- Fixes runtime when trying to put dna-less brain mmi into a dnalocked mech.
- Removed carbon/var/list/features, we now only have dna.features and prefs.features
- Remove hulk mutation from lizards and other species (Fixed 6413); only real humans can acquire hulk. (less work on sprites for each ones, fixes lizard tail not in hulk color)
- Fixes cloning not setting up correctly dna UE and dna.real_name
- I fixed the issue with sucked+cloned ling being unable to absorb
- I fixed issue with changeling proc checking if they have the dna already not working.
- Fixed 4095, low health hulk with DAA getting stuck in loop of acquiring/losing hulk.
- I added a second layer for mutations to differientate mutations that go below and above the body layer (Fixes 7858)
- Fixes 10048, the transform to initial appearence button was fucking up the dna.

- Fixes cloning not setting up correctly dna UE and dna.real_name
- Fixed the issue with sucked+cloned ling being unable to absorb
- Fixed issue with changeling proc checking if they have the dna already not working.
- Fixed 4095, low health hulk with DAA getting stuck in loop of acquiring/losing hulk.
- Added a second layer for mutations to differientate mutations that go below and above the body layer (Fixes 7858)
- Fixes 10048, the transform to initial appearence button was fucking up the dna.
2015-09-19 22:18:28 +02:00
Xhuis af31d566b2 Syndicate medical cyborgs 2015-09-17 20:02:48 -04:00
Razharas 73db85100c Merge pull request #11769 from phil235/FixMutations
Some dna fixes
2015-09-15 22:31:59 +03:00
phil235 428a28a440 Fixes monkeyize/humanize removing the mob's viruses when they should be kept.
Fixes NOCLONE and CLUMSY being in both disabilities and mutations. they're now only disabilities.
Fixes minttoxin not gibbing people with the fat disabilities.
Fixes some runtimes, replacing usr by user in some places.
Fixes mutation overlays being removed when updating overlays.
Remove the now unused mob/var/list/mutations and human/var/blood_type
Fixed some formatting in preferences.dm
2015-09-13 22:52:38 +02:00
bear1ake f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
octareenroon91 1327441478 Correct 'You inject' text
Injections will now correctly report the amount of reagent you inject. Lethal injection syringes specifically will report correctly.
2015-09-05 16:47:21 -06:00
duncathan 51c09f16bf makes all Destroy()'s return properly 2015-08-31 00:21:01 -06:00
Cheridan 7f0f74f100 Merge pull request #11380 from bgobandit/salicyclicassblastusa
Fixes burn kits containing salicyclic acid pills. Adds new burn medication.
2015-08-27 23:53:58 -05:00
bgobandit 6ab2443255 Adds oxandrolone, a new burn medication designed to work upon ingestion. Adds oxandrolone to burn kits. Adds changelog. 2015-08-25 13:46:05 -04:00
bgobandit 2c56462e97 I sure do love me some copypasta 2015-08-24 22:45:37 -04:00
bgobandit 132adf3f00 adds silver sulf syringes instead of kelotane pills 2015-08-24 21:45:18 -04:00
bgobandit ce8722b868 Fixes burn kits containing salicyclic acid pills. 2015-08-24 21:36:50 -04:00
Jordie bdd6a75382 Merge pull request #11119 from phil235/VaporizeMethodReaction
reagents reaction() now has more application method
2015-08-19 19:23:17 +10:00
MMMiracles 35b78b1209 Revamps bioterror darts into a non-lethal syringe form. Removed the coniine and spore toxin to make it solely for quiet take-downs (in thoery). 2015-08-11 01:56:38 -04:00
phil235 d2a4024e7f reagent reaction() now use more methods. Instead of just INGEST or TOUCH, we now have INGEST (for injection, ingestion), TOUCH (for splashing), PATCH (for patch application and blob attack), and VAPOR (for smoke, foam and spray application).
- TOUCH no longer transfer reagent by default, it's now only used for touch based effect like being flammable when touched by fuel or you and your stuff being acided when touched by acid).

- PATCH does no transfer of its own (but actual patches code do make a transfer) but is used for touch effect that ignore clothes and protection (blob attacks, patches effect going through hardsuits)

- VAPOR does reagent transfer but it takes into account clothing protection

Fixes a typo in humanoid/get_permeability_prot
Fixes acid splashing on objects not destroying it. Fixes acid splashing on turf not destroying objects on the turf.

Changed damp rag smothering code a bit.

Blob Smoke now doesn't do anything.
2015-08-09 14:23:12 +02:00
phil235 677b24ab68 derp 2015-07-23 13:12:00 +02:00
phil235 9fab0f3641 Fixes beaker feeding not calling the right volume for the ingestion reaction.
Same fix for ninja suit adrenalin boost.
Simplifies reagent_containers/glass/attackby() a bit.
2015-07-23 13:05:53 +02: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 242c3e9f2f Merge pull request #10634 from Iamgoofball/patch-101
Buffs the Bioterror Chem Sprayer
2015-07-17 15:43:08 -05:00
phil235 236215b03c Fixes damp rag smothering 2015-07-16 17:20:08 +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