Commit Graph

107 Commits

Author SHA1 Message Date
oranges
eda8f7f7df Log attempted injections as well as successful ones 2017-09-29 15:57:13 -05:00
kingofkosmos
a479714b5f Adds missing span-endings (#30494)
* Adds missing </span>'s.

* ".name]" --> "]" and
"to_chat(GLOB.admins," --> "message_admins("
and one [name] --> [src]

* Earlier commit was a mistake, lesson learned

* Hopefully all is ok now.

* Revert "Hopefully all is ok now."

This reverts commit 3c95e41b4c13ce96469861e9a97453adf4b56826.

* Revert "Earlier commit was a mistake, lesson learned"

This reverts commit d611af1e4a76690453a7f9808b6e2c429b679f6c.

* Revert "".name]" --> "]" and"

This reverts commit d538b9efef2d7d8be9122bf5ceaf105055059bc6.

* message_admins fix
2017-09-11 14:09:53 +02:00
Ian Turk
7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06:00
Jordan Brown
af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00
Cyberboss
1acd7fe210 Merge pull request #29555 2017-07-29 20:41:03 -04:00
ShizCalev
d525b18d8d Completes major inhand split project (#29574)
* Completes split project

* More work on it. Should be more or less finished
2017-07-29 16:47:37 -03:00
Xhuis
381082066d Fixes syringe injection not working 2017-07-28 11:16:06 -04:00
ShizCalev
59ef81245b Changes some 1s and 0s to TRUE and FALSE (#29144) 2017-07-10 10:31:34 -04:00
Really-Good-Soda-Flavor
930b15e625 Adds container types INJECTABLE and DRAWABLE (#28853)
* Adds container types INJECTABLE and DRAWABLE

* Make the chemistry readme a text file and updates it!

* Unfucks the readme!

* Another attempt at fixing the readme

* Remove the readme from the .dme

why was it a dm file!!
2017-06-27 09:19:25 -04:00
nicbn
77a2d3f5cd Replaces "istype"s with is_helpers macros (#28676) 2017-06-22 15:03:19 -03:00
Joan Lung
228df13447 Merge branch 'master' of https://github.com/tgstation/tgstation into initialnew
Conflicts:
	code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
	code/modules/station_goals/bsa.dm
	code/modules/vehicles/atv.dm
2017-04-25 07:32:06 -04:00
MrPerson
ff3f84ab81 Replaces /image with /mutable_appearance, where appropriate (#26518)
In cases where you're creating an image to use as an overlay, it makes more sense to use a mutable_appearance if you can. The image will create a static appearance for not just the image but also each intermediate step if you change vars along the way. The mutable appearance avoids this unnecessary and expensive process. The only situation that requires an image instead of a mutable_appearance is if the overlay is supposed to be directional. MA's ignore direction while images don't. I dunno why, probably another BYOND-ism.

I added a convenience function, mutable_appearance(), designed to emulate image(). Also went ahead and set the default plane of /mutable_appearance to FLOAT_PLANE because it's fucking 0 by default.

Several overlays that were image() calls were changed to just text strings when I could. overlays += "string" has the same result as overlays += image(icon, "string") and saves a proc call.
2017-04-25 12:15:16 +02:00
Joan Lung
52cb6f9c06 some failures are just overchanging stuff 2017-04-19 18:43:14 -04:00
Joan Lung
db9d86a39e New() goes in the trash, we've gotta Initialize() 2017-04-19 18:22:26 -04:00
4dplanner
2f1f0da5be Adds another can_inject check just before injecting (#26001)
* Adds another check before injecting/applying medicals stacks

* More helpful comments

* Updates to use extra_checks
2017-04-11 15:25:07 +02:00
AnturK
20b4d649d2 Fixes syringes for monkeys 2017-04-02 21:48:51 +02:00
Lzimann
5a618297ce Replaces the default output with the to_chat wrapper. 2017-03-10 01:32:05 -03:00
Lzimann
e58ee1724f Refactors logging into a single var for all mobs and adds a wrapper for proper logging. 2017-03-04 13:32:35 -03:00
Trugath
4105ca9ea6 Tgmonkey (#22338)
* Monkeys are a bit more of a handful
They will aggro, steal, pick up weapons and stuff bodies in disposals

* search using held_items instead of manually

* Only natural monkies should reliably stun
Natural monkies don't try to stun-lock

* Pushes equip_in_one_of_slots to carbon from human

* Removed unused helper.

* Make the trip and stun only against monkeys
The main reason this is here is for the swarm behaivour.

* Just return true for now. It should flee on next life tick.

* remove blocking call from Life

* stuff_mob_in blocks so make it non-blocking

* add check to stop add/remove in same function
Only occours if the monkey attacks someone who isn't in the enemies list.
This only happens during a monkey swarm. Best to check.

* Fix for monkeys ripping stuff off walls.

* Moved shared emote/weaken down into living
Called the new function knockOVer. Monkey and Secbot both have different
control flow before the shared code.

* Stop monkeys fighting over body

* Remove commented out code

* Reduce flee range

* replace spawn with addTimer by moving code into callbacks

* Move magic numbers to defines
Also removed 900 delay in resisting cuffs as its a useless argument

* Refactor. Attacking has a function: monkey_attack
Combined de-aggro into it

* rework monkeyDrop to force drop
Also check for deleted items when snatching items

* Aggresive can be toggled by an admin
Allows for a mass mob of angry monkies

* Tweak aggressive monkeys to attack each other less
Monkey vs Monkey probability is a define
Warning: Once MVM combat breaks out in large mobs, mayhem insues

* Set the monkey back to idle once it attemps to dispose the body

* fix for aggressive monkeys self-harming

* comment wording fix

* changed walk2derpless to a callback and fixed deathgrip
2017-01-06 14:59:37 +01:00
Firecage
50bbf5aa50 Allows syringes and droppers to show their reagents when examined while wearing things such as Science Goggles. (#22618)
* Allows syringes and droppers to show their reagents when examined.

* rearranges my logic

* replaces SEMIOPENCONTAINER with TRANSPARENT

* Silly spelling error fix.

* Moves the defines from flags to container_type to avoid issues with conflicting flags

* changes it back to obj/item/O

* Moves the OPENCONTAINER and TRANSPARENT defines to the reagents.dm
2017-01-04 20:00:46 +13:00
phil235
b7efc2cef4 Make energy guns able to use burst fire. (#21005)
* Make energy guns able to use burst fire.

* Changed obj/item/weapon/gun/projectile to /gun/ballistic and the name of the folder from "projectile" to "ballistic" to avoid confusion between actually projectiles and guns.

Syringe gun, energy guns and magic guns can now use burst fire.

* fixing merge conflict shit

* fixing map conflicts

* more map conflict fix

* two tiny fixes.

* tiny tweak

* fixing merge conflicts.
Moving the practice mini egun to the gun module.
Renamed nuclear.dm to energy_gun.dm

* map conflict fixes
2016-11-02 16:16:21 +13:00
TechnoAlchemist
f8e54b25ba Makes lethal injection actually lethal. (#19278)
* Makes lethal injection actually lethal.

* Spacing
2016-07-13 18:19:10 +12:00
Cruix
ac0bad5d61 Added priority overlay system. (#18225)
Added priority overlays to atoms, which will not be removed when overlays are cut and will always remain on top when new overlays are added. This requires everyone to use add_overlay() and cut_overlays() instead of overlays += and overlays.Cut(). These procs are found in __HELPERS/icons.dm, and the priority overlay list is found in game/atoms.dm. Everything else is replacing deprecated overlay manipulation.
2016-06-17 10:11:53 +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
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
e7d5be221e Small fixes and changes 2016-05-24 23:04:00 +03:00
AnturK
895406cd36 Merge pull request #17428 from Dahka/New_Syringes
Adds three new syringes
2016-05-24 17:37:40 +02:00
Dahka
91b3a03421 Add change suggested by RemieRichards, change research costs again. 2016-05-08 20:27:39 -03:00
Dahka
c35c3055a4 Increased syringes production and research cost 2016-05-06 13:37:16 -03:00
Dahka
e9a74db93a adds piercing syringe and design to protolathe 2016-05-05 21:45:38 -03:00
Dahka
41e9342a2b adds new syringe types and piercing syringe projectile 2016-05-05 21:45:37 -03: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
KorPhaeron
9d208197ba Sloth 2016-02-23 05:05:11 -06:00
KorPhaeron
d17d34edc9 Three lavaland ruins 2016-02-23 01:07:06 -06:00
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
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
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
c0
feeb9ff7d2 Organs update 3 2015-09-25 22:26:15 +03: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
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
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
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
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
Francis Devine
2800bca2d8 Add sanity checks to syringe injection after the do_mob call 2015-07-10 10:26:59 +12: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