Neerti
4f77afece1
Revert 58ef59734f
2015-11-08 10:09:14 -05:00
mwerezak
af52b475ff
Fixes missing cooldowns, missing cult blade sound.
2015-09-09 15:15:43 -04:00
mwerezak
0a751322e3
Rewrites shield handling
...
Rewrites shield handling to be less hardcoded.
Shields now take into account the damage source and direction when blocking.
Riot shields no longer block most bullets, but are better at blocking melee and thrown items than they were previously.
Energy shields block projectiles with a similar probability as they did before, and block melee and thrown as well as riot shields do.
Shields no longer block from directly behind the player.
Weapons now only block melee attacks.
Cool effects when blocking with an energy shield or energy sword (including holoswords).
2015-08-26 10:39:31 -04:00
PsiOmega
3a08e2884a
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/structures/crates_lockers/largecrate.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/research/circuitprinter.dm
2015-08-15 10:52:17 +02:00
mwerezak
133bc96344
Fixes #10645
...
Sets unacidable where appropriate.
2015-08-14 23:20:10 -04:00
Zuhayr
48cf00ca54
Merge with dev-freeze.
2015-06-21 20:45:47 +09:30
mwerezak
f8d5127078
Adds SLOT_EARS to various items
2015-06-21 01:45:43 -04:00
PsiOmega
d0232732d4
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/floodlight.dm
code/game/objects/items/devices/suit_cooling.dm
code/modules/organs/subtypes/diona.dm
code/modules/paperwork/pen.dm
code/modules/reagents/reagent_containers/hypospray.dm
html/changelogs/.all_changelog.yml
2015-05-30 16:11:57 +02:00
GinjaNinja32
76daebe0db
More consistent logging via admin_inject_log proc
2015-05-29 16:57:42 +01:00
GinjaNinja32
86f52910a1
Fixes #5945 , de-copy-pastes parapens and sleepypens
...
Harm-syringes, hyposprays, parapens and sleepypens now all respect armour, and produce admin logs for transferred reagents if any are transferred.
2015-05-28 22:23:37 +01:00
Zuhayr
f0006ec6bf
Removes redundant surgery for brain and eye repair, now covered by organ repair in general.
...
Attempted to limit regular surgery to non-robotic limbs and added surgical steps for robotic limbs.
Readded checks for smoking reagent transfer.
Fixes, oversights, tweaks with IPC.
Added some reagent bypassing for NO_BLOOD and some checks to various affect_touch() calls for NO_SCAN/IPC.
Added prosthetic-scanning functionality to cyborg analyzer.
Added prosthetic analysis to the robot analyzer.
Allowed people with internal cells to charge in robot chargers (IPCs).
2015-05-25 14:49:57 +09:30
Kelenius
317abc6b79
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/datums/recipe.dm
code/game/machinery/bots/farmbot.dm
code/game/machinery/bots/medbot.dm
code/game/mecha/equipment/tools/tools.dm
code/game/objects/effects/chem/chemsmoke.dm
code/game/objects/effects/effect_system.dm
code/game/objects/items/toys.dm
code/game/objects/items/weapons/extinguisher.dm
code/game/objects/items/weapons/mop.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/organs/organ_internal.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/Chemistry-Recipes.dm
code/modules/reagents/reagent_containers/food/snacks.dm
code/modules/reagents/reagent_containers/pill.dm
code/modules/reagents/reagent_containers/spray.dm
maps/exodus-1.dmm
2015-04-28 10:49:26 +03:00
Kelenius
d9e2947b32
Updates chemistry colors
2015-04-28 09:23:39 +03:00
PsiOmega
1ae0ad6d92
Updates the atom_pool, now datum_pool, to handle any datum object.
...
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
Kelenius
502c9f1510
Fixes missed merge leftovers in syringe.dm
2015-03-31 18:34:59 +03:00
Kelenius
41ff9819bd
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/modules/mob/living/carbon/carbon.dm
code/modules/organs/organ_internal.dm
code/modules/organs/organ_objects.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/reagent_containers/syringes.dm
2015-03-31 17:44:42 +03:00
mwerezak
398459c2e7
Merge remote-tracking branch 'upstream/dev' into inventoryfix
...
Conflicts:
code/modules/organs/organ_external.dm
2015-03-31 02:13:22 -04:00
mwerezak
9b2f5cea33
Merge remote-tracking branch 'upstream/dev' into inventoryfix
...
Conflicts:
code/game/gamemodes/revolution/rp-revolution.dm
code/game/machinery/kitchen/juicer.dm
code/game/objects/items/stacks/stack.dm
code/game/objects/items/weapons/cigs_lighters.dm
code/game/objects/structures/stool_bed_chair_nest/stools.dm
code/modules/destilery/main.dm
code/modules/hydroponics/biogenerator.dm
code/modules/mob/living/carbon/human/inventory.dm
code/modules/mob/living/carbon/monkey/inventory.dm
code/modules/projectiles/guns/launcher/pneumatic.dm
2015-03-31 01:37:55 -04:00
mwerezak
cdfce64ad0
Replaces uses of u_equip() with remove_from_mob() or drop_from_inventory(), where appropriate.
2015-03-30 22:05:00 -04:00
=
601e6fb7ef
Merged with dev.
2015-03-31 11:17:13 +10:30
PsiOmega
464d702d4b
Mob refactoring.
...
Updates Bump() code.
Intents now use constants.
Simple animals can now use languages without overriding say().
There is now a difference between being able to smash normal and reinforced walls.
Reworks simple_animal/attackby so that constructs don't need to override it simply to add damage resistance.
2015-03-29 10:44:31 +02:00
Zuhayr
8f242740a8
Added Techhead's cyberlimbs under datum system. Added limbs to dionaea. Working on robotic limbs.
2015-03-28 11:01:11 +10:30
Kelenius
b4b635f32d
Chemistry commit
...
I messed something in the git
2015-03-25 19:09:10 +03:00
Zuhayr
97112c8a4c
Replaced display_name with name, worked on severing limbs and damage propagation.
2015-03-25 19:07:22 +10:30
Zuhayr
e0f23aead5
Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP.
2015-03-11 21:17:51 +10:30
mwerezak
01798c98b6
Rewrites syringe and dart guns
2015-02-13 01:34:35 -05:00
Chinsky
f8b94456ba
Merge pull request #7844 from Kelenius/ofDryingAndRacks
...
Adds drying racks, tobacco, and updates pipes
2015-02-04 18:15:13 +03:00
GinjaNinja32
fa75cb9fab
Change beakers, bottles, syringes and vials to use /image and multiplicative blending
2015-02-03 15:23:48 +00:00
Kelenius
6f7a7177f2
Adds drying racks and updates pipes
...
You can now dry plants using a special machine, and you can now stuff
those plants into pipes to smoke then. It slowly transfers the reagents
from the plant into the smoker.
2015-01-16 02:57:59 +03:00
Zuhayr
90d65aed57
Removed attack_paw, attack_animal and attack_slime.
2014-11-13 17:15:29 +10:30
Zuhayr
9fcde12b4f
Organ rewrite mapclean attempt.
2014-09-29 06:18:58 +09:30
Hubblenaut
4ee6b77289
Adds new syndicate closet and adjusts nuke setup
2014-07-15 17:22:03 +02:00
Hubblenaut
38895916b6
Adds grey shuttle tiles and drug syringes
2014-07-15 17:20:04 +02:00
mwerezak
5a3c7dc432
Fixes human/checkarmor getting the armour...
...
...value for the wrong body part.
Whoever put ran_zone() in there wasn't thinking straight, as it's not
going to affect the part that actually gets damaged.
2014-06-18 10:05:04 -04:00
Chinsky
be95e54e43
Merge branch 'master' into dev
...
Conflicts:
code/defines/obj/weapon.dm
code/modules/mob/living/carbon/species.dm
code/modules/mob/living/silicon/say.dm
icons/mob/uniform.dmi
maps/tgstation2.dmm
2014-06-17 16:16:44 +04:00
mwerezak
1b33ca943d
Separates the sharp flag into edge and sharp
...
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.
Also separates is_sharp, has_edge, and can_puncture.
2014-06-15 20:25:39 -04:00
Zuhayr
9e7fe6d700
Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.
2014-06-11 01:14:38 +09:30
Zuhayr
a68c4e9c55
Fixes #3993
2014-05-10 10:26:05 +09:30
Graham Lloyd
72e45ebf7b
A first pass at more realistic w_class values
2014-04-03 17:54:06 -04:00
Zuhayr
5940993694
Removed a return.
2014-01-05 14:20:53 +10:30
Zuhayr
19979562c9
Made syringes take from the reagents datum of a NO_BLOOD mob rater than vessel.
2014-01-05 14:20:23 +10:30
Zuhayr
b05f81df3d
Added NO_BLOOD checks to drips, syringes.
2014-01-05 14:13:58 +10:30
Mloc-Argent
a1f55a50b1
Massive click code rework by SuperSayu, ported from TG.
...
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648
Hopefully done right this time.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-10-08 20:27:39 +01:00
Kilakk
0e08e80bb0
Changed syringes and vials to work correctly with the autolathe
2013-09-08 14:24:06 -04:00
Erthilo
a7f1b50f1b
Fixes reagent and throw logging.
2013-08-30 00:38:10 +01:00
Erthilo
0cb361f737
Removed undeeded "ATTACK:"
2013-08-28 03:37:11 +01:00
Erthilo
3fbdc99079
Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.
2013-08-28 03:33:04 +01:00
comma
747c71096e
Fixed monkeys not getting space rabies via syringes.
2013-08-04 00:32:37 +04:00
Zuhayr
1d28bb7cb3
Message tweaks.
2013-06-28 15:55:41 -07:00
Zuhayr
f5abc3e041
Syringes now have an increased delay when injecting through a hardsuit.
2013-06-27 17:59:37 -07:00
