LordFowl
93143a8e45
Vaurca Update Dec2016 ( #1289 )
...
Adds Vaurca subspecies and a whole slew of content related to them. Also, custom organs for them.
2016-12-25 01:11:09 +02:00
Alberyk
b247ba78a4
Adding socks ( #1284 )
...
The long waited sock update;
Socks are being added as another underwear like option, with some exclusive ones for females. Only humans (and squish) can have them atm.
Also, I am nearly sure this will work.
2016-12-24 04:28:43 +02:00
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
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
skull132
fa128c7294
510 - Fixes Blindness ( #440 )
...
Removes the blindness due to outdated overlay control.
2016-06-23 14:45:01 +03: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
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
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
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
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
Zuhayr
6d15c43377
Fixes several issues with drones.
2015-11-21 15:01:43 +10:30
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
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
Kelenius
bed03443d1
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/ZAS/Airflow.dm
code/__defines/items_clothing.dm
2015-08-21 16:15:07 +03:00
Chinsky
317eaf4771
Merge pull request #10101 from mwerezak/shards
...
Refactors obj flags and changes defined bitflag representation
2015-08-20 19:47:58 +03:00
GinjaNinja32
a9773207b2
Merge remote-tracking branch 'upstream/dev' into client_dir
2015-08-19 09:42:48 +01:00
mwerezak
ac738f3db4
Moves flags values to item_flags var
...
Moves flags that seemed to pertain more to equipment to a new item_flags
var in /obj/item
2015-08-18 17:18:25 -04:00
GinjaNinja32
1957029890
HUD cleanup, human/monkey HUD now turns correctly with client.dir
2015-08-18 18:21:25 +01:00
PsiOmega
0d10d53b65
Another Hurt/Harm fix.
...
Apparently clicking the intents directly or cycling through them updates the icons differently. Nice.
2015-08-18 18:41:24 +02:00
PsiOmega
75c7313c46
On merge changes and map conflict fixes.
2015-08-18 18:19:51 +02:00
Zuhayr
71214d859e
Merge with master.
2015-08-18 11:31:10 -07:00
PsiOmegaDelta
edebf946d8
Harm icon state consistency.
...
All icon states relating to the I_HARM intent now all use the same naming convention.
2015-08-17 10:16:39 +02:00
Kelenius
60196df634
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/modules/projectiles/gun.dm
2015-08-13 08:40:31 +03:00
GinjaNinja32
ea76feb3cd
Compile fix
2015-08-11 18:47:25 +01:00
GinjaNinja32
631ff21980
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/gamemodes/cult/runes.dm
code/game/objects/items/weapons/implants/implantcase.dm
code/game/objects/items/weapons/melee/energy.dm
code/modules/mob/living/carbon/human/emote.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/human_attackhand.dm
code/modules/mob/living/silicon/robot/drone/drone.dm
code/modules/mob/living/silicon/robot/emote.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/nano/modules/crew_monitor.dm
code/modules/organs/organ_internal.dm
2015-08-11 18:47:05 +01:00
PsiOmegaDelta
617db485ee
qdel/Destroy entries.
2015-07-21 14:22:01 +02:00
PsiOmegaDelta
616b4b60e4
Magical fixes.
...
The wizard den is no longer pitch black.
Fixes targeted spells using the wrong caster/source.
Adds some missing checks using the caster source above.
Re-logging should no longer cause a loss of spell UI icons.
Mind transfer should no longer cause unintended spell loss.
2015-07-21 11:34:25 +02:00
PsiOmega
cee5f1a057
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items.dm
2015-07-06 18:33:09 +02:00
PsiOmega
cdb4270f48
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-07-06 17:31:41 +02:00
GinjaNinja32
b8e0015be1
Changes cyborg HUD to not display a superfluous empty row
...
Title. Modules with precisely 8, 16, 24 etc items were showing an extra row, this changes it from floor(X/8)+1 to just ceil(X/8).
2015-07-04 14:47:10 +01:00
Kelenius
0071ed3f24
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/_onclick/click.dm
code/_onclick/telekinesis.dm
code/game/machinery/deployable.dm
code/game/objects/items.dm
code/game/objects/structures/grille.dm
code/modules/mob/living/simple_animal/simple_animal.dm
code/setup.dm
2015-06-07 14:05:54 +03:00
GinjaNinja32
314a28fa75
Merge remote-tracking branch 'upstream/dev' into span_class=notice
...
Conflicts:
code/game/antagonist/station/rogue_ai.dm
code/game/machinery/OpTable.dm
code/game/machinery/floodlight.dm
code/game/machinery/spaceheater.dm
2015-06-02 17:33:20 +01:00
Zuhayr
4a7b728fa2
Used some defines. No idea if this is what they are for but they have the same values #yolo
2015-06-02 17:20:10 +09:30
Zuhayr
dadc434f4e
Ported action button system from Paradise/tg
2015-06-02 17:17:13 +09:30
GinjaNinja32
e8f02b8496
Minor folders. code/defines, code/FEA, code/__HELPERS, code/_onclick, code/TriDimension, code/ZAS
2015-05-29 20:36:48 +01:00
