Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into new-decal-painter

Browse Source

...

This commit is contained in:

SandPoot

2023-02-06 20:24:35 -03:00

parent d53c010745 7e77bc8023

commit b955bc222b

140 changed files with 1040 additions and 418 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

BIN

icons/mob/OnFire.dmi

Binary file not shown.

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

BIN

icons/mob/clothing/feet.dmi

Binary file not shown.

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

BIN

icons/mob/clothing/feet_digi.dmi

Binary file not shown.

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

BIN

icons/mob/clothing/hands.dmi

Binary file not shown.

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

BIN

icons/mob/icemoon/64x64megafauna.dmi

Binary file not shown.

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

BIN

icons/mob/inhands/equipment/belt_lefthand.dmi

Binary file not shown.

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

BIN

icons/mob/inhands/equipment/belt_righthand.dmi

Binary file not shown.

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

BIN

icons/mob/inhands/weapons/axes_lefthand.dmi

Binary file not shown.

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

BIN

icons/mob/inhands/weapons/axes_righthand.dmi

Binary file not shown.

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

BIN

icons/mob/inhands/weapons/melee_lefthand.dmi

Binary file not shown.

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

BIN

icons/mob/inhands/weapons/melee_righthand.dmi

Binary file not shown.

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

BIN

icons/mob/inhands/weapons/swords_lefthand.dmi

Binary file not shown.

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

BIN

icons/mob/inhands/weapons/swords_righthand.dmi

Binary file not shown.

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

BIN

icons/obj/clothing/belt_overlays.dmi

Binary file not shown.

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

BIN

icons/obj/clothing/belts.dmi

Binary file not shown.

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

BIN

icons/obj/clothing/gloves.dmi

Binary file not shown.

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

BIN

icons/obj/clothing/shoes.dmi

Binary file not shown.

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

BIN

icons/obj/contraband.dmi

Binary file not shown.

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

BIN

icons/obj/drinks.dmi

Binary file not shown.

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

BIN

icons/obj/grenade.dmi

Binary file not shown.

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

BIN

icons/obj/items_and_weapons.dmi

Binary file not shown.

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

BIN

icons/obj/reagentfillings.dmi

Binary file not shown.

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