Merge branch 'master' into glassware

Browse Source

...

This commit is contained in:

TrilbySpaceClone

2019-12-07 12:50:32 -05:00

parent 82ab55453b cece6dd43d

commit e5c8f7bf06

932 changed files with 16815 additions and 10794 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/mob/AI.dmi

BIN

Binary file not shown.

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

icons/mob/actions/actions_silicon.dmi

BIN

Binary file not shown.

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

icons/mob/dogborg.dmi

BIN

Binary file not shown.

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

icons/mob/feet_digi.dmi

BIN

Binary file not shown.

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

icons/mob/head.dmi

BIN

Binary file not shown.

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

icons/mob/head_muzzled.dmi

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 80 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: 16 KiB

icons/mob/inhands/64x64_lefthand.dmi

BIN

Binary file not shown.

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

icons/mob/mask_muzzled.dmi

BIN

Binary file not shown.

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

icons/mob/mutant_bodyparts.dmi

BIN

Binary file not shown.

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

icons/mob/pai.dmi

BIN

Binary file not shown.

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

icons/mob/robots.dmi

BIN

Binary file not shown.

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

icons/mob/screen_alert.dmi

BIN

Binary file not shown.

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

icons/mob/suit.dmi

BIN

Binary file not shown.

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

icons/mob/suit_digi.dmi

BIN

Binary file not shown.

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

icons/mob/taur_canine.dmi

BIN

Binary file not shown.

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

icons/mob/taur_hooved.dmi

BIN

Binary file not shown.

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

icons/mob/taur_naga.dmi

BIN

Binary file not shown.

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

icons/mob/uniform.dmi

BIN

Binary file not shown.

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

icons/mob/uniform_digi.dmi

BIN

Binary file not shown.

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

icons/mob/wings.dmi

BIN

Binary file not shown.

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

icons/obj/cardboard_cutout.dmi

BIN

Binary file not shown.

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

icons/obj/chemical.dmi

BIN

Binary file not shown.

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

icons/obj/clothing/hats.dmi

BIN

Binary file not shown.

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

icons/obj/clothing/suits.dmi

BIN

Binary file not shown.

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

icons/obj/clothing/uniforms.dmi

BIN

Binary file not shown.

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

icons/obj/device.dmi

BIN

Binary file not shown.

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

icons/obj/drinks.dmi

BIN

Binary file not shown.

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

icons/obj/guns/energy.dmi

BIN

Binary file not shown.

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

icons/obj/hydroponics/growing.dmi

BIN

Binary file not shown.

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

icons/obj/hydroponics/growing_flowers.dmi

BIN

Binary file not shown.

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

icons/obj/hydroponics/growing_fruits.dmi

BIN

Binary file not shown.

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

icons/obj/hydroponics/growing_mushrooms.dmi

BIN

Binary file not shown.

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

icons/obj/hydroponics/harvest.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 52 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: 23 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: 123 KiB After Width:  |  Height:  |  Size: 124 KiB

icons/obj/items_cyborg.dmi

BIN

Binary file not shown.

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

icons/obj/kitchen.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/plushes.dmi

BIN

Binary file not shown.

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

icons/obj/power.dmi

BIN

Binary file not shown.

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

icons/obj/sofa.dmi

BIN

Binary file not shown.

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

icons/obj/storage.dmi

BIN

Binary file not shown.

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

icons/obj/tiles.dmi

BIN

Binary file not shown.

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

icons/obj/tools.dmi

BIN

Binary file not shown.

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

icons/turf/floors.dmi

BIN

Binary file not shown.

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