Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685

Browse Source

...

This commit is contained in:

Ghommie

2020-05-12 20:06:59 +02:00

parent b2a20d5438 0b03958136

commit 7fb96ab0cf

557 changed files with 283936 additions and 4436 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/UI_Icons/chat/chat_icons.dmi

BIN

Binary file not shown.

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

icons/effects/parallax.dmi

BIN

Binary file not shown.

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

icons/mob/animal.dmi

BIN

Binary file not shown.

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

icons/mob/blob.dmi

BIN

Binary file not shown.

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

icons/mob/clothing/alpha_masks.dmi

BIN

Binary file not shown.

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

icons/mob/clothing/back.dmi

BIN

Binary file not shown.

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

icons/mob/clothing/feet.dmi

BIN

Binary file not shown.

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

icons/mob/clothing/feet_digi.dmi

BIN

Binary file not shown.

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

icons/mob/clothing/head.dmi

BIN

Binary file not shown.

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

icons/mob/clothing/mask.dmi

BIN

Binary file not shown.

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

icons/mob/clothing/mask_muzzled.dmi

BIN

Binary file not shown.

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

icons/mob/clothing/taur_hooved.dmi

BIN

Binary file not shown.

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

icons/mob/clothing/uniform.dmi

BIN

Binary file not shown.

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

icons/mob/clown_mobs.dmi

BIN

Binary file not shown.

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

icons/mob/icemoon/64x64megafauna.dmi

BIN

Binary file not shown.

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

icons/mob/icemoon/icemoon_monsters.dmi

BIN

Binary file not shown.

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

icons/mob/inhands/equipment/security_lefthand.dmi

BIN

Binary file not shown.

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

icons/mob/inhands/equipment/security_righthand.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.3 KiB After Width:  |  Height:  |  Size: 1.5 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/screen_alert.dmi

BIN

Binary file not shown.

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

icons/mob/screen_ghost.dmi

BIN

Binary file not shown.

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

icons/obj/advancedtools.dmi

BIN

Binary file not shown.

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

icons/obj/ammo.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/assemblies/new_assemblies.dmi

BIN

Binary file not shown.

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

icons/obj/chess.dmi

BIN

Binary file not shown.

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

icons/obj/clothing/masks.dmi

BIN

Binary file not shown.

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

icons/obj/clothing/shoes.dmi

BIN

Binary file not shown.

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

icons/obj/doors/puzzledoor/default.dmi

BIN

Binary file not shown.

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

icons/obj/doors/puzzledoor/wood.dmi

BIN

Binary file not shown.

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

icons/obj/food/burgerbread.dmi

BIN

Binary file not shown.

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

icons/obj/food/food.dmi

BIN

Binary file not shown.

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

icons/obj/genitals/breasts.dmi

BIN

Binary file not shown.

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

icons/obj/genitals/breasts_onmob.dmi

BIN

Binary file not shown.

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

icons/obj/genitals/dildo.dmi

BIN

Binary file not shown.

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

icons/obj/genitals/effects.dmi

BIN

Binary file not shown.

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

icons/obj/genitals/hud.dmi

BIN

Binary file not shown.

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

icons/obj/genitals/onahole.dmi

BIN

Binary file not shown.

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

icons/obj/genitals/penis.dmi

BIN

Binary file not shown.

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

icons/obj/genitals/penis_onmob.dmi

BIN

Binary file not shown.

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

icons/obj/genitals/taur_penis_onmob.dmi

BIN

Binary file not shown.

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

icons/obj/genitals/testicles.dmi

BIN

Binary file not shown.

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

icons/obj/genitals/testicles_onmob.dmi

BIN

Binary file not shown.

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

icons/obj/genitals/vagina.dmi

BIN

Binary file not shown.

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

icons/obj/genitals/vagina_onmob.dmi

BIN

Binary file not shown.

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

icons/obj/ice_moon/artifacts.dmi

BIN

Binary file not shown.

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

icons/obj/items_and_weapons.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 122 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.3 KiB After Width:  |  Height:  |  Size: 2.4 KiB

icons/obj/lavaland/artefacts.dmi

BIN

Binary file not shown.

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

icons/obj/loot_piles.dmi

BIN

Binary file not shown.

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

icons/obj/mining.dmi

BIN

Binary file not shown.

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

icons/obj/monitors.dmi

BIN

Binary file not shown.

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

icons/obj/objects.dmi

BIN

Binary file not shown.

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

icons/obj/puzzle_small.dmi

BIN

Binary file not shown.

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

icons/turf/floors.dmi

BIN

Binary file not shown.

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

icons/turf/floors/icechasms.dmi

BIN

Binary file not shown.

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

icons/turf/mining.dmi

BIN

Binary file not shown.

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

icons/turf/snow.dmi

BIN

Binary file not shown.

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