skull132
ee68f3c9d0
Final merge
...
Merge branch 'development-2' into development
# Conflicts:
# baystation12.dme
# code/_helpers/icons.dm
# code/controllers/master_controller.dm
# code/game/machinery/Sleeper.dm
# code/game/machinery/computer3/laptop.dm
# code/game/machinery/doors/door.dm
# code/game/machinery/floorlayer.dm
# code/game/machinery/vending.dm
# code/game/mecha/mech_fabricator.dm
# code/game/objects/effects/decals/contraband.dm
# code/game/objects/explosion.dm
# code/game/objects/items/robot/robot_upgrades.dm
# code/game/objects/items/weapons/melee/misc.dm
# code/game/objects/items/weapons/storage/boxes.dm
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/game/objects/structures/window.dm
# code/modules/clothing/spacesuits/rig/rig.dm
# code/modules/clothing/suits/jobs.dm
# code/modules/mob/freelook/update_triggers.dm
# code/modules/mob/living/carbon/human/human_defense.dm
# code/modules/mob/living/carbon/human/human_movement.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/living/carbon/human/species/species.dm
# code/modules/mob/living/carbon/human/species/station/station.dm
# code/modules/mob/living/living_defines.dm
# code/modules/mob/mob_helpers.dm
# code/modules/mob/mob_movement.dm
# code/modules/projectiles/ammunition/boxes.dm
# nano/templates/sleeper.tmpl
2016-11-12 00:10:21 +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
NanakoAC
c4b36a5490
Sprinting, Stamina and Temporary Modifiers ( #1030 )
...
Introduces:
- Temporary modifiers process and datums for that
- A new stamina and sprinting mechanic. That is in need of further development! Weee!
2016-10-26 18:22:39 +03:00
Bedshaped
0dba7bc83f
67 errors, 0 warnings ( #4 )
2016-10-16 12:34:07 +03:00
skull132
31620ed3a8
More conflict clearance!
2016-10-07 01:13:36 +03:00
skull132
1910f487af
Conflict clearance, vol deux.
2016-10-07 00:59:00 +03:00
skull132
87e041aa75
Merge remote-tracking branch 'bay12-upstream/master' into development
2016-10-07 00:58:39 +03:00
NanakoAC
67f7584cf9
Altclick useability tweaks ( #936 )
...
Adds pointing at things with alt+rightclick uasing some hacky code wizardry, thanks to kaiochao on the byond forums.
Also adds simple spam control to pointing, and changes the point verbs from using View, to Range, which is mildly faster
Also adds the ability to alt+click to eject your ID from PDAs and many computers. Anything to save on laggy rightclicks
2016-09-17 18:01:19 +03:00
NanakoAC
a5478a5360
Animal Tweaks: Second attempt ( #849 )
...
* Merge branch 'AnimalTweaks_Fix4' into AnimalTweaks_Fix5
# Conflicts:
# code/modules/mob/living/living.dm
* REMOVED VENT THINGS FROM CHANGELOG
* switch statement for helper
2016-09-12 07:06:40 +01:00
NanakoAC
6c81c4a8d8
Flash Screenobject Fix ( #806 )
...
Prevents developers, and those with certain other admin perms, from seeing the 'flash' object whenever they rightclick anywhere. This is a constant annoyance
No changelog since it doesn't concern the general playerbase
2016-08-26 00:19:47 +02:00
LordFowl
a6c1085e37
Fowl's Bugfixes 1 ( #521 )
2016-07-10 01:13:29 +03:00
skull132
fa128c7294
510 - Fixes Blindness ( #440 )
...
Removes the blindness due to outdated overlay control.
2016-06-23 14:45:01 +03:00
NanakoAC
8a4bf1d738
Alt-attack and trays ( #394 )
...
Added alt-attack function to held items/weapons, triggered by holding alt while clicking. Opens a lot of future possibilities. Works for cyborgs too. Only trays use it right now.
Overhauled trays to be useful and not-broken. See changelog for specifics.
2016-06-23 02:14:55 +03:00
skull132
3d3dbcb8f0
JMP logs for days
...
Adds JMP messages to most forms of physical attacks.
2016-03-25 18:27:37 +02:00
Ryan784
10b3fc505e
AI UI Fix #37
...
Upped AI Hud layer so Static wasn't on top.
2016-02-03 15:18:05 -05:00
PsiOmegaDelta
6089ccccea
Makes events global.
...
Greatly decreases the number of objects that need to be created (currently 3 event handlers in total vs basically 3 per datum)
The price is a slower lookup of listeners but on a per round basis it should still be much less than the current startup time penalty.
2016-01-26 13:12:37 +01:00
Datraen
625f2c1b16
Converts wizard eye laser to the new projectile system.
...
Fixes #11432 .
2016-01-24 18:44:18 +01:00
PsiOmegaDelta
1210a6e42f
Adds the moved event.
...
Allows movable atoms to follow other movable atoms, as quickly as BYOND allows. Also supports following atoms inside other atoms.
However, this only works fully when Move() or forceMove() is utilized. Setting loc directly will not raise the moved event.
2016-01-18 20:16:48 +01:00
Ryan784
40b86c142d
Updated verbs
...
Send message should work, also updated all the procs to their baystation
equivalent instead of simply using our old code (shoulda done this in
the first place)
2016-01-15 02:35:36 -05:00
Ryan784
757c33ad84
AI-HUD and interface
...
Adds back in AI buttons/interface, for easier access to verbs.
Send-Message and Take-Picture verbs for AI appear to be bugged/unusable,
holding off on fixing in case of any bay updates.
2016-01-15 01:59:13 -05:00
PsiOmegaDelta
f7f214e1a3
del() removal.
2016-01-02 14:04:30 +01:00
PsiOmegaDelta
f6eec096e7
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_onclick/click.dm
code/game/objects/items/weapons/material/kitchen.dm
code/modules/mob/living/silicon/ai/ai.dm
2015-12-20 11:55:53 +01:00
PsiOmegaDelta
5d3d0c5dc3
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/material/kitchen.dm
2015-12-20 11:22:08 +01:00
PsiOmegaDelta
f62f24e1ac
Removes Stat() sleep.
...
Fixes a Stat() runtime that occasionally occur if the client was logged out when the sleep() was done sleeping.
Fixes delays when using alt+Turf click.
Makes the alt+Turf click panel only update when viewed instead. Seems like the better performance fix option in general.
Makes the alt+Turf click panel always use the "Turf" name, consistency.
2015-12-16 13:24:40 +01:00
Zuhayr
1ab263f662
Rewrote targeting.
2015-12-16 10:10:13 +10:30
Zuhayr
2da40e525e
Removed targeting.
2015-12-16 10:09:20 +10:30
PsiOmegaDelta
b2720a8c6c
Fixes sparks causing runtimes on pooling.
2015-12-09 20:41:55 +01:00
PsiOmegaDelta
2402b3ccd8
Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower
2015-12-07 17:56:27 +01:00
Chinsky
106d53fa3c
Merge pull request #11602 from PsiOmegaDelta/151205-AIClickRuntime
...
AI clicking no longer overrides the state in Topic calls.
2015-12-07 19:56:04 +03:00
PsiOmegaDelta
12fb0bdb10
Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower
...
Conflicts:
code/modules/nano/nanoui.dm
2015-12-06 12:10:33 +01:00
PsiOmegaDelta
b89e19e5a5
Merge remote-tracking branch 'upstream/dev-freeze' into dev.
...
Conflicts:
code/datums/datacore.dm
code/defines/procs/records.dm
code/game/machinery/camera/camera_assembly.dm
code/modules/client/preferences.dm
code/modules/client/preferences_savefile.dm
code/modules/mob/language/station.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/species/species.dm
code/modules/mob/living/carbon/human/species/station/station.dm
code/modules/surgery/organs_internal.dm
html/changelogs/.all_changelog.yml
2015-12-06 11:48:20 +01:00
PsiOmegaDelta
1dffd68100
AI clicking no longer overrides the state in Topic calls.
...
Fixes (partially) #11205 .
2015-12-05 13:57:35 +01:00
PsiOmegaDelta
94b999772b
Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower
...
Conflicts:
code/game/machinery/computer/atmos_alert.dm
code/game/machinery/computer/station_alert.dm
2015-12-04 11:22:27 +01:00
PsiOmegaDelta
4d8ff90857
Wizard spell Destroy() additions.
...
Backport of #11586 . Fixes #11555 .
2015-12-04 09:48:46 +01:00
PsiOmegaDelta
67ba794f0c
Corrects Wizard spell overlay positioning.
...
Includes some Destroy() cleanup.
Fixes the rest of #11583 . Fixes #11555 .
2015-12-04 09:15:42 +01:00
PsiOmegaDelta
8cbb9319b3
Refactors mob HUD initialization.
...
Mainly because of human monkeys, which should get their hud because they are monkeys not because they are small (otherwise, those poor Resomi). And also because not all small mobs should have the monkey HUD.
Fixes #11583 .
2015-12-04 08:51:24 +01:00
PsiOmegaDelta
50fb4a8de7
Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower
...
Conflicts:
code/game/objects/items/devices/multitool.dm
2015-11-23 08:57:12 +01:00
Zuhayr
6d15c43377
Fixes several issues with drones.
2015-11-21 15:01:43 +10:30
PsiOmegaDelta
47ece50813
Allows the AI to utilize its multitool where applicable.
2015-11-18 11:01:08 +01:00
mwerezak
07881e7495
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into attack-cleanup2
...
Conflicts:
code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
2015-10-15 07:08:16 -04:00
PsiOmegaDelta
019c147bdc
HUD element positioning.
...
HUD positions are now relative the client view screen edges instead of absolute.
We don't currently use custom client view ranges, but this potentially makes it more reasonable to implement (an example is a new short sighted species of ours).
Port of https://github.com/d3athrow/vgstation13/pull/5984 .
2015-10-06 12:51:03 +02:00
HarpyEagle
7f066065d3
Merge remote-tracking branch 'upstream/dev' into attack-cleanup2
...
Conflicts:
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
code/modules/mob/living/simple_animal/simple_animal.dm
2015-10-05 19:20:33 -04:00
PsiOmegaDelta
9dd1a54191
Destroy tweaks.
...
Ports Destroy() proc tweaks from Paradise and /tg/, sourced from https://github.com/ParadiseSS13/Paradise/pull/2091 .
Adds returns in Destroy()s, to prepare for future return values.
2015-09-25 10:44:23 +02:00
LightningIron
9e2edf5ab4
Fixes #11145 .
2015-09-20 19:42:54 -05:00
GinjaNinja32
c014866ac9
Remove unneccessary /area/start definition
2015-09-12 08:46:50 +01:00
mwerezak
af52b475ff
Fixes missing cooldowns, missing cult blade sound.
2015-09-09 15:15:43 -04:00
mwerezak
6e66ad307c
Refactors bottle smashing, apply_hit_effect() now returns the blocked status.
2015-09-09 13:58:45 -04:00
mwerezak
080e365911
Prevents attacking yourself with items unless on harm intent
2015-09-08 23:51:40 -04:00
mwerezak
41f52b3dd7
Adds some documentation to item_attack.dm
2015-09-08 23:41:50 -04:00
mwerezak
068d02c28c
Refactors various item attack() implementations
...
Replaced some attack() overrides with apply_hit_effect() or other attack
procs where appropriate.
Removed the attack() override from reagent_containers.
2015-09-08 23:39:33 -04:00