Merge branch 'master' into donut

Browse Source

...

This commit is contained in:

Trilbyspaceclone

2019-12-17 15:12:51 -05:00

committed by GitHub

parent 285833c8d3 8b61c07713

commit 0f5c8db456

700 changed files with 12811 additions and 3750 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

icons/effects/96x96.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.6 MiB After Width:  |  Height:  |  Size: 1.6 MiB

icons/misc/language.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.5 KiB After Width:  |  Height:  |  Size: 4.8 KiB

icons/misc/mark_icons.dmi

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 433 B

icons/mob/accessories.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 9.2 KiB After Width:  |  Height:  |  Size: 9.5 KiB

icons/mob/actions/actions_elites.dmi

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.4 KiB

icons/mob/actions/actions_spells.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 21 KiB After Width:  |  Height:  |  Size: 22 KiB

icons/mob/actions/bloodsucker.dmi

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 16 KiB

icons/mob/feet.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 18 KiB After Width:  |  Height:  |  Size: 19 KiB

icons/mob/feet_digi.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 25 KiB After Width:  |  Height:  |  Size: 26 KiB

icons/mob/head.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 206 KiB After Width:  |  Height:  |  Size: 208 KiB

icons/mob/hud.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 16 KiB After Width:  |  Height:  |  Size: 18 KiB

icons/mob/inhands/equipment/idcards_lefthand.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 419 B After Width:  |  Height:  |  Size: 545 B

icons/mob/inhands/equipment/idcards_righthand.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 433 B After Width:  |  Height:  |  Size: 566 B

icons/mob/inhands/weapons/guns_lefthand.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 56 KiB After Width:  |  Height:  |  Size: 56 KiB

icons/mob/inhands/weapons/guns_righthand.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 60 KiB After Width:  |  Height:  |  Size: 61 KiB

icons/mob/inhands/weapons/melee_lefthand.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.2 KiB After Width:  |  Height:  |  Size: 2.4 KiB

icons/mob/inhands/weapons/melee_righthand.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.3 KiB After Width:  |  Height:  |  Size: 2.5 KiB

icons/mob/lavaland/lavaland_elites.dmi

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 20 KiB

icons/mob/neck.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 43 KiB After Width:  |  Height:  |  Size: 45 KiB

icons/mob/screen_elite.dmi

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.6 KiB

icons/mob/suit.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 390 KiB After Width:  |  Height:  |  Size: 394 KiB

icons/mob/underwear.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 58 KiB After Width:  |  Height:  |  Size: 61 KiB

icons/mob/uniform.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 330 KiB After Width:  |  Height:  |  Size: 333 KiB

icons/obj/clothing/accessories.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 10 KiB After Width:  |  Height:  |  Size: 9.5 KiB

icons/obj/clothing/hats.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 101 KiB After Width:  |  Height:  |  Size: 102 KiB

icons/obj/clothing/shoes.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 14 KiB After Width:  |  Height:  |  Size: 14 KiB

icons/obj/clothing/uniforms.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 96 KiB After Width:  |  Height:  |  Size: 96 KiB

icons/obj/guns/projectile.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 36 KiB After Width:  |  Height:  |  Size: 37 KiB

icons/obj/hydroponics/equipment.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 25 KiB After Width:  |  Height:  |  Size: 26 KiB

icons/obj/hydroponics/growing.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 70 KiB After Width:  |  Height:  |  Size: 70 KiB

icons/obj/hydroponics/harvest.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 82 KiB After Width:  |  Height:  |  Size: 82 KiB

icons/obj/hydroponics/seeds.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 25 KiB After Width:  |  Height:  |  Size: 25 KiB

icons/obj/items_and_weapons.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 124 KiB After Width:  |  Height:  |  Size: 126 KiB

icons/obj/lavaland/artefacts.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 25 KiB After Width:  |  Height:  |  Size: 26 KiB

icons/obj/lavaland/elite_trophies.dmi

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.0 KiB

icons/obj/lavaland/legionnaire_bonfire.dmi

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.2 KiB

icons/obj/lavaland/tumor.dmi

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 988 B

icons/obj/library.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 26 KiB After Width:  |  Height:  |  Size: 27 KiB

icons/obj/module.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 16 KiB After Width:  |  Height:  |  Size: 20 KiB

icons/obj/projectiles.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 117 KiB After Width:  |  Height:  |  Size: 122 KiB

icons/obj/projectiles_impact.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 24 KiB After Width:  |  Height:  |  Size: 24 KiB

icons/obj/projectiles_muzzle.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 25 KiB After Width:  |  Height:  |  Size: 25 KiB

icons/obj/projectiles_tracer.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.4 KiB After Width:  |  Height:  |  Size: 5.5 KiB

icons/obj/stack_objects.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 40 KiB After Width:  |  Height:  |  Size: 41 KiB

icons/obj/stake.dmi

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 866 B

icons/obj/vamp_obj.dmi

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.8 KiB

icons/turf/smoothrocks.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.8 KiB After Width:  |  Height:  |  Size: 5.3 KiB