NanakoAC
6cef8c9074
Attack Proc fixes ( #1259 )
...
Baymerge changed the attack proc, i think by removing a default value, and a lot of things broke because they weren't using the function correctly.
This proc does three main things.
Adds a default to /obj/item/proc/attack to target the chest when no target zone is supplied.
Fixes the lack of a target zone in many attack procs, properly defining it so it'll get passed to the parent, and ensure that bodypart-specific targeting works.
Removes most instances of code to retrieve the user's selected zone, and instead to use the zone passed into the attack function. saves duplication of effort.
2016-12-24 03:34:23 +02:00
skull132
e9b688e1f6
Merge branch 'development-2' into development
...
Christ on a stick. SO MANY ERRORS. REEE.
# Conflicts:
# baystation12.dme
# code/_helpers/lists.dm
# code/_helpers/logging.dm
# code/_helpers/text.dm
# code/_onclick/click.dm
# code/controllers/configuration.dm
# code/controllers/master_controller.dm
# code/datums/supplypacks.dm
# code/game/antagonist/antagonist.dm
# code/game/antagonist/antagonist_print.dm
# code/game/antagonist/outsider/commando.dm
# code/game/antagonist/outsider/ninja.dm
# code/game/area/areas.dm
# code/game/gamemodes/cult/cult_items.dm
# code/game/gamemodes/game_mode.dm
# code/game/jobs/access.dm
# code/game/machinery/atmoalter/canister.dm
# code/game/machinery/autolathe.dm
# code/game/machinery/doors/airlock.dm
# code/game/machinery/recharger.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/mecha/mech_fabricator.dm
# code/game/mecha/mecha.dm
# code/game/objects/effects/spiders.dm
# code/game/objects/items.dm
# code/game/objects/items/devices/PDA/PDA.dm
# code/game/objects/items/devices/flash.dm
# code/game/objects/items/devices/lightreplacer.dm
# code/game/objects/items/devices/paicard.dm
# code/game/objects/items/devices/scanners.dm
# code/game/objects/items/devices/suit_cooling.dm
# code/game/objects/items/devices/uplink.dm
# code/game/objects/items/robot/robot_upgrades.dm
# code/game/objects/items/toys.dm
# code/game/objects/items/weapons/cards_ids.dm
# code/game/objects/items/weapons/handcuffs.dm
# code/game/objects/items/weapons/manuals.dm
# code/game/objects/items/weapons/material/kitchen.dm
# code/game/objects/items/weapons/material/misc.dm
# code/game/objects/items/weapons/material/swords.dm
# code/game/objects/items/weapons/melee/energy.dm
# code/game/objects/items/weapons/melee/misc.dm
# code/game/objects/items/weapons/scrolls.dm
# code/game/objects/items/weapons/storage/belt.dm
# code/game/objects/items/weapons/stunbaton.dm
# code/game/objects/items/weapons/tools.dm
# code/game/objects/objs.dm
# code/game/objects/structures/crates_lockers/closets.dm
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/game/objects/structures/janicart.dm
# code/game/sound.dm
# code/game/turfs/simulated.dm
# code/game/verbs/ooc.dm
# code/global.dm
# code/modules/admin/verbs/debug.dm
# code/modules/admin/verbs/modifyvariables.dm
# code/modules/client/client procs.dm
# code/modules/client/preferences.dm
# code/modules/clothing/clothing.dm
# code/modules/clothing/head/hardhat.dm
# code/modules/clothing/head/helmet.dm
# code/modules/clothing/head/jobs.dm
# code/modules/clothing/head/misc_special.dm
# code/modules/clothing/shoes/jobs.dm
# code/modules/clothing/spacesuits/alien.dm
# code/modules/clothing/spacesuits/captain.dm
# code/modules/clothing/spacesuits/miscellaneous.dm
# code/modules/clothing/spacesuits/rig/rig_pieces.dm
# code/modules/clothing/spacesuits/rig/suits/alien.dm
# code/modules/clothing/spacesuits/spacesuits.dm
# code/modules/clothing/spacesuits/void/merc.dm
# code/modules/clothing/spacesuits/void/void.dm
# code/modules/clothing/suits/armor.dm
# code/modules/clothing/suits/jobs.dm
# code/modules/clothing/suits/storage.dm
# code/modules/clothing/suits/utility.dm
# code/modules/clothing/suits/wiz_robe.dm
# code/modules/clothing/under/jobs/security.dm
# code/modules/economy/Events.dm
# code/modules/economy/Events_Mundane.dm
# code/modules/economy/economy_misc.dm
# code/modules/events/blob.dm
# code/modules/events/event.dm
# code/modules/events/event_container.dm
# code/modules/events/event_manager.dm
# code/modules/events/money_lotto.dm
# code/modules/events/prison_break.dm
# code/modules/events/spacevine.dm
# code/modules/hydroponics/trays/tray.dm
# code/modules/mob/dead/observer/observer.dm
# code/modules/mob/emote.dm
# code/modules/mob/holder.dm
# code/modules/mob/language/station.dm
# code/modules/mob/living/bot/cleanbot.dm
# code/modules/mob/living/carbon/alien/diona/diona.dm
# code/modules/mob/living/carbon/alien/diona/diona_attacks.dm
# code/modules/mob/living/carbon/give.dm
# code/modules/mob/living/carbon/human/emote.dm
# code/modules/mob/living/carbon/human/human.dm
# code/modules/mob/living/carbon/human/human_defense.dm
# code/modules/mob/living/carbon/human/inventory.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/living/carbon/human/species/outsider/vox.dm
# code/modules/mob/living/carbon/human/species/station/golem.dm
# code/modules/mob/living/carbon/human/species/station/station.dm
# code/modules/mob/living/carbon/human/update_icons.dm
# code/modules/mob/living/carbon/metroid/metroid.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/living_defense.dm
# code/modules/mob/living/living_defines.dm
# code/modules/mob/living/silicon/ai/ai.dm
# code/modules/mob/living/silicon/pai/admin.dm
# code/modules/mob/living/silicon/pai/pai.dm
# code/modules/mob/living/silicon/robot/drone/drone.dm
# code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
# code/modules/mob/living/silicon/robot/emote.dm
# code/modules/mob/living/silicon/robot/robot_items.dm
# code/modules/mob/living/silicon/robot/robot_modules.dm
# code/modules/mob/living/silicon/silicon.dm
# code/modules/mob/living/simple_animal/bees.dm
# code/modules/mob/living/simple_animal/friendly/cat.dm
# code/modules/mob/living/simple_animal/friendly/corgi.dm
# code/modules/mob/living/simple_animal/friendly/farm_animals.dm
# code/modules/mob/living/simple_animal/friendly/mouse.dm
# code/modules/mob/living/simple_animal/friendly/spiderbot.dm
# code/modules/mob/living/simple_animal/hostile/hostile.dm
# code/modules/mob/living/simple_animal/simple_animal.dm
# code/modules/mob/logout.dm
# code/modules/mob/mob.dm
# code/modules/mob/mob_grab_specials.dm
# code/modules/mob/mob_helpers.dm
# code/modules/mob/new_player/sprite_accessories.dm
# code/modules/organs/organ.dm
# code/modules/organs/organ_alien.dm
# code/modules/organs/organ_external.dm
# code/modules/paperwork/faxmachine.dm
# code/modules/projectiles/ammunition/boxes.dm
# code/modules/projectiles/ammunition/bullets.dm
# code/modules/projectiles/guns/energy/nuclear.dm
# code/modules/projectiles/guns/energy/rifle.dm
# code/modules/projectiles/guns/energy/special.dm
# code/modules/projectiles/guns/projectile.dm
# code/modules/projectiles/guns/projectile/automatic.dm
# code/modules/projectiles/guns/projectile/pistol.dm
# code/modules/projectiles/guns/projectile/revolver.dm
# code/modules/projectiles/guns/projectile/shotgun.dm
# code/modules/projectiles/projectile/bullets.dm
# code/modules/projectiles/projectile/special.dm
# code/modules/reagents/reagent_containers.dm
# code/modules/reagents/reagent_containers/food/drinks.dm
# code/modules/research/designs.dm
# code/modules/research/destructive_analyzer.dm
# code/modules/research/rdconsole.dm
# code/modules/spells/artifacts.dm
# code/modules/spells/spellbook.dm
# code/modules/tables/tables.dm
# code/world.dm
# config/example/config.txt
# icons/mob/items_lefthand.dmi
# icons/mob/items_righthand.dmi
# icons/obj/lighting.dmi
2016-10-31 00:01:52 +02:00
skull132
87e041aa75
Merge remote-tracking branch 'bay12-upstream/master' into development
2016-10-07 00:58:39 +03:00
NanakoAC
804851f6f6
Diona Overhaul - SEP2016 ( #442 )
2016-09-09 23:55:48 +03:00
Bedshaped
77b3b01847
Bloodpack and IV drip additions ( #627 )
2016-08-14 22:04:14 +03:00
NanakoAC
9b02debc8c
Fixes #79 ( #665 )
2016-08-03 03:20:47 +03:00
NanakoAC
d1f79a6168
Janitor slot and janicart tweaks ( #612 )
...
Adds an extra janitor slot and some mapping work to support it, reworks the janicart a fair bit.
changes:
rscadd: "Increased number of janitor slots to two."
rscadd: "Janitorial carts can now be constructed with metal sheets, and deconstructed with a wrench, welder or plasmacutter if empty."
tweak: "Janicarts now come without a bucket. Click and drag a mop bucket onto a cart to mount it, and you can unmount it from the janicart interface."
tweak: "Placing a mop into a janicart, and pouring containers into the bucket, is now done with alt-click. A leftclick will now always wet the mop, and throw objects into the trashbag, respectively."
rscadd: "Janicarts can now be climbed over like tables - Click and drag your sprite onto it."
tweak: "Custodial closet's Spraycleaner, cleaning grenades, and spare lights, are now inside the janitorial locker instead of on table/floor."
tweak: "Added an extra janitorial locker in the custodial closet."
bugfix: "Fixed the Captain's deluxe soap being unuseable for cleaning"
tweak: "Soap can now clean more tiles when wetted"
tweak: "Soap and rags can now be wetted in buckets, mopbuckets, watertanks and janicarts"
2016-08-02 21:42:48 +03:00
skull132
6e00593de0
Bugfix Bonanza - Skull's turn ( #555 )
...
Fixes #531
Fixes #276
`/mob/living/proc/revive` now also sets `mob/var/suiciding` to false. This is to stop rejuvinated/ling revived mobs from dying again after being brought back.
Fixes #92
Fixes #479
Fixes #157
Fixes #533
Fixes #486
Fixes #528
2016-07-12 14:53:57 +03:00
skull132
0b85a4321f
Porting Zuhayr's Fixes For Forensics
2016-02-01 17:31:29 +02:00
skull132
fe48f26d71
Porting forensics from Aurora.
2016-02-01 17:08:47 +02:00
Zuhayr
c4c63b5d19
Forensics fixes/tweaks.
2015-12-10 19:34:28 +10:30
Zuhayr
1244c4a5fd
Porting forensics from Aurora.
2015-10-24 02:15:06 +10:30
PsiOmegaDelta
1b64487f8d
More computer overlay changes.
...
Fixes #10764 and a couple other computers.
2015-08-20 08:38:43 +02:00
PsiOmega
c81ad0964e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/reagents/reagent_containers/food/drinks/bottle.dm
2015-08-15 11:06:03 +02: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
mwerezak
34bcc3143a
Fixes bad span
2015-08-13 18:37:18 -04:00
mwerezak
e0965bc2cb
Implements inserting rags into booze bottles
2015-08-13 18:37:17 -04:00
mwerezak
880f82935f
Implements lighting rags on fire
...
Rags can be lit on fire if soaked with welder fuel. While lit, the rag provides light, starts fires, and attacking mobs will ignite them.
Rags can be put out by clicking in hand.
Rags will burn out after a short time, turning into ash.
2015-08-13 18:37:14 -04:00
mwerezak
7198f98058
Improves support for rags as reagent containers
...
Rags now hold just under half a glass worth of reagents.
Fixes rags wiping down a mob while smothering them.
Rags can now be wrung out over a container or the floor, emptying it's
contents.
When wiping down stuff, a small amount of the rag's contents are
splashed onto the atom.
2015-08-13 18:32:51 -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
0a05c2659f
All the span-corrected dm files.
2015-06-14 22:08:14 +02:00
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
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
24ef7752cd
Merge branch 'Baystation12/dev' into ofChemistryAndStuff
...
Conflicts:
code/modules/mob/living/carbon/monkey/life.dm
code/modules/mob/living/carbon/monkey/monkey.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/reagent_containers/glass.dm
2015-03-28 19:14:59 +03:00
Kelenius
b4b635f32d
Chemistry commit
...
I messed something in the git
2015-03-25 19:09:10 +03:00
volas
f8822626bb
sanitize() refactor: second pass(other sanitize functions)
2015-03-23 01:38:09 +03:00
mwerezak
6d15809768
Corrects return values for the Topic procs of several computers and some other machines as well.
2015-02-25 21:32:35 -05:00
Zuhayr
20da84646b
Merge pull request #7964 from Baystation12/dev-freeze
...
Dev-Freezer -> Master v0.1.17 Botswan Punchout
2015-02-02 02:14:08 +10:30
Chinsky
b159bd389b
Added forensic scanner wipe verb
...
It clutters up scanner console very much after each update, and selective deletion sounds like too much effort (can do it on console anyway).
2015-01-28 00:53:40 +03:00
Chinsky
24f4ff2a32
Fixed partial fingerprints data
...
Now scanning console properly updates the partial fingerprints with new data and fingerprint cards.
Also fixed lack of newline in details screen.
2015-01-28 00:52:35 +03:00
Chinsky
ee7f71ab64
Added update_prints helper
...
It updates forensic data datum with fingerprints and returns 1 if there was a match.
2015-01-28 00:36:22 +03:00
Chinsky
ba0dbffbd0
Fixed fingerprint cards.
...
They didn't perform their sole function - getting fullprint on touch, so now they do. Still respecting gloves, mutations etc.
2015-01-28 00:32:21 +03:00
Kelenius
10de826ca3
Removes FPRINT and TABLEPASS flags
2015-01-23 22:27:32 +03:00
PsiOmega
2a796f2ddd
Merge remote-tracking branch 'upstream/master' into dev
2014-11-21 10:27:56 +01:00
MagmaRam
72b0000f6a
Fixes a bug where core samplers dispensed bags that you could not take rock slivers out of.
2014-11-20 00:41:43 -05:00
PsiOmega
bc438e21ad
All the relevant examine changes.
2014-11-05 12:44:23 +01:00
mwerezak
d721673d8d
Fixes #6592
2014-10-04 02:11:51 -04:00
Zuhayr
0c83a95b90
Large merge resultion. Used remote for map conflicts.
2014-09-23 21:41:54 +09:30
mwerezak
47a7b2cc17
Fixes #6459
2014-09-20 01:06:05 -04:00
Chinsky
eab2ef935b
Fixed copypaste derp resulting in runtime when you are naked sans gloves.
2014-08-27 03:41:11 +04:00
Chinsky
b43759fee9
Initial commit of detective console rewrite.
...
Changed forensic data to use record datum instead of unreadable arrays.
Now handheld scanner transfers data by clicking the big console, not by scan.
Rewrote high res scanner console. Now it leaves compiling dossiers to player, via use of filters.
2014-08-19 00:50:14 +04:00
Zuhayr
f09d1218fe
Master to dev merge.
2014-08-11 17:23:40 +09:30
Whitellama
a36becad2b
Wet rag no longer makes noise or hits when wiping down windows (nor does anything with the NOBLUDGEON flag)
2014-08-01 17:05:54 -07:00
Whitellama
425dfd2a6e
Fixed issue with recognizing covered jumpsuit and gloves
2014-07-26 17:07:34 -07:00
Hubblenaut
f12ee3f7b3
Fixes some printouts causing a runtime error when photocopied
2014-06-07 18:27:22 +02:00
Hubblenaut
87cc10a2d3
Updates the Screen even when usr is using another console
2014-05-06 04:54:06 +02:00
Graham Lloyd
72e45ebf7b
A first pass at more realistic w_class values
2014-04-03 17:54:06 -04:00
YotaXP
68ae21fac3
Optimized and refactored list2text, text2list, and replacetext.
...
Also fixed some grammar in the station blueprint code.
Conflicts:
code/game/objects/items/blueprints.dm
code/game/objects/items/devices/uplinks.dm
code/modules/admin/verbs/debug.dm
code/modules/clothing/masks/gasmask.dm
code/modules/detectivework/scanner.dm
code/modules/flufftext/TextFilters.dm
code/modules/mob/living/carbon/human/say.dm
code/modules/mob/living/silicon/ai/say.dm
2014-01-08 11:41:51 +00:00
