Skip to content
This repository has been archived by the owner on Apr 6, 2024. It is now read-only.

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit ea586a7
Author: Pspritechologist <[email protected]>
Date:   Thu Mar 16 17:48:17 2023 -0400

    Squashed commit of the following:

    commit 3d2ece3
    Merge: fe1eb01 e0cfc42
    Author: Pspritechologist <[email protected]>
    Date:   Thu Mar 16 17:46:46 2023 -0400

        Merge branch 'master' of https://github.com/space-wizards/space-station-14

    commit e0cfc42
    Author: deltanedas <[email protected]>
    Date:   Thu Mar 16 02:19:08 2023 +0000

        only add emag component if the event was handled (#14627)

        Co-authored-by: deltanedas <@deltanedas:kde.org>

    commit 3b5354c
    Author: PJBot <[email protected]>
    Date:   Wed Mar 15 19:51:12 2023 -0400

        Automatic changelog update

    commit e0427bb
    Author: not-gavnaed <[email protected]>
    Date:   Thu Mar 16 02:50:07 2023 +0300

        add station records computer(space-wizards/space-station-14#14524) on aspid and bagel (#14691)

        Co-authored-by: WIN-AOO91TUKDC7\geniy <[email protected]>

    commit eb04c43
    Author: Flipp Syder <[email protected]>
    Date:   Tue Mar 14 21:47:40 2023 -0700

        Invalid species fallback on spawn/profile validation (#14675)

        * if a player's profile has an invalid species, station spawning will always try to fallback to the default humanoid species

        * validation always ensures that if a species can't be indexed, the species falls back to the default species

    commit dfcf3c2
    Author: PJBot <[email protected]>
    Date:   Wed Mar 15 00:38:53 2023 -0400

        Automatic changelog update

    commit 281e9d1
    Author: randy10122 <[email protected]>
    Date:   Wed Mar 15 12:37:49 2023 +0800

        gives all heads of staff their own bags in backpack.yml, gives them flashes, a little setup for the telebaton (#14632)

    commit 73ff756
    Author: PJBot <[email protected]>
    Date:   Wed Mar 15 00:08:20 2023 -0400

        Automatic changelog update

    commit 07491f5
    Author: Leon Friedrich <[email protected]>
    Date:   Wed Mar 15 17:07:16 2023 +1300

        doafter hotfix (#14678)

    commit 265604e
    Author: PJBot <[email protected]>
    Date:   Tue Mar 14 22:06:58 2023 -0400

        Automatic changelog update

    commit 2f88173
    Author: Leon Friedrich <[email protected]>
    Date:   Wed Mar 15 15:05:53 2023 +1300

        DoAfter and other bugfixes (#14669)

    commit 5df1d61
    Author: PJBot <[email protected]>
    Date:   Tue Mar 14 21:35:41 2023 -0400

        Automatic changelog update

    commit 80518a7
    Author: metalgearsloth <[email protected]>
    Date:   Wed Mar 15 12:34:37 2023 +1100

        Add water footsteps to puddles (#14671)

    commit 52f7224
    Author: PJBot <[email protected]>
    Date:   Tue Mar 14 21:08:56 2023 -0400

        Automatic changelog update

    commit 434e736
    Author: Checkraze <[email protected]>
    Date:   Tue Mar 14 21:07:52 2023 -0400

        Lava Brig Dungeon Theme (#14637)

    commit 5843fa1
    Author: PJBot <[email protected]>
    Date:   Tue Mar 14 20:39:03 2023 -0400

        Automatic changelog update

    commit 547c599
    Author: Kara <[email protected]>
    Date:   Tue Mar 14 17:37:59 2023 -0700

        Revert "Syndicate Encryption Key buff" (#14665)

    commit 52f2970
    Author: Leon Friedrich <[email protected]>
    Date:   Wed Mar 15 13:23:49 2023 +1300

        Update engine (#14666)

    commit 983ffee
    Author: PJBot <[email protected]>
    Date:   Tue Mar 14 20:15:23 2023 -0400

        Automatic changelog update

    commit 24ef92d
    Author: Leon Friedrich <[email protected]>
    Date:   Wed Mar 15 13:14:18 2023 +1300

        Fix `EmptyContainer` construction action (#14406)

    commit 1a9cf49
    Author: Emisse <[email protected]>
    Date:   Tue Mar 14 00:46:22 2023 -0600

        Fland Update 1.4 (#14652)

    commit 4156f3d
    Author: Emisse <[email protected]>
    Date:   Tue Mar 14 00:46:09 2023 -0600

        Marathon Update 4.7 (#14650)

    commit 278b8ef
    Author: PJBot <[email protected]>
    Date:   Tue Mar 14 01:38:27 2023 -0400

        Automatic changelog update

    commit c3dcc7a
    Author: Moony <[email protected]>
    Date:   Tue Mar 14 00:37:21 2023 -0500

        Flash now flashes black instead of white. (#14642)

    commit 7638ad1
    Author: PJBot <[email protected]>
    Date:   Mon Mar 13 23:43:11 2023 -0400

        Automatic changelog update

    commit 33f937c
    Author: potato1234_x <[email protected]>
    Date:   Tue Mar 14 13:42:07 2023 +1000

        Frezon Canister Tweaks (#14442)

    commit 650f942
    Author: PJBot <[email protected]>
    Date:   Mon Mar 13 22:57:00 2023 -0400

        Automatic changelog update

    commit d6af11a
    Author: faint <[email protected]>
    Date:   Tue Mar 14 05:55:56 2023 +0300

        Station Records Computer now shows fingerprints (#14524)

        * station records fingerprints

        * Add UI + Fixes

        * now itll display N/A if a mob doesnt have a fingerprint

        * ? - 0

        * f8

        * N/A is a fluent string now

        * remove locale string duplicating

        * no whitespace

    commit 89d3875
    Author: Nemanja <[email protected]>
    Date:   Mon Mar 13 22:55:18 2023 -0400

        Fix access wires emagging machines (#14471)

        * Fix access wires emagging machines

        * comment

        * le fix

    commit 73efa95
    Author: PJBot <[email protected]>
    Date:   Mon Mar 13 20:14:02 2023 -0400

        Automatic changelog update

    commit b15c9ab
    Author: potato1234_x <[email protected]>
    Date:   Tue Mar 14 10:12:58 2023 +1000

        Missing Uniform Held sprites (#14584)

    commit 6ef89fc
    Author: PJBot <[email protected]>
    Date:   Mon Mar 13 19:40:10 2023 -0400

        Automatic changelog update

    commit 6b8728b
    Author: Nemanja <[email protected]>
    Date:   Mon Mar 13 19:39:05 2023 -0400

        Make makeshift handcuffs green (#14645)

    commit 49f7575
    Author: Nemanja <[email protected]>
    Date:   Mon Mar 13 19:34:26 2023 -0400

        Cuffable/Handcuff ECS (#14382)

    commit 59bf67e
    Author: AJCM-git <[email protected]>
    Date:   Mon Mar 13 17:12:57 2023 -0400

        Revert  "Add tree felling and chopping sounds" (#14622) (#14643)

    commit 5facbf0
    Author: PJBot <[email protected]>
    Date:   Mon Mar 13 16:43:34 2023 -0400

        Automatic changelog update

    commit 10290bf
    Author: metalgearsloth <[email protected]>
    Date:   Tue Mar 14 07:42:29 2023 +1100

        Add tree felling and chopping sounds (#14622)

    commit b329abc
    Author: Checkraze <[email protected]>
    Date:   Mon Mar 13 16:36:35 2023 -0400

        Cargo Pallet Sale Console (#14422)

    commit a7f9b28
    Author: QuantumSeanyGlass <[email protected]>
    Date:   Mon Mar 13 13:16:04 2023 -0700

        Mutation Toxins (#14314)

    commit f0605e5
    Author: PJBot <[email protected]>
    Date:   Mon Mar 13 15:27:24 2023 -0400

        Automatic changelog update

    commit b450b4c
    Author: Rane <[email protected]>
    Date:   Mon Mar 13 15:26:20 2023 -0400

        Welding airlocks changes their layer (#13440)

    commit c6307cc
    Author: Emisse <[email protected]>
    Date:   Mon Mar 13 13:14:12 2023 -0600

        Quadruple the amount of time you are allowed to play interns (#14641)

    commit 3b90a63
    Author: 08A <[email protected]>
    Date:   Mon Mar 13 19:51:36 2023 +0100

        Refactor context menu UI (#14334)

    commit 383a8f8
    Author: PJBot <[email protected]>
    Date:   Mon Mar 13 13:49:00 2023 -0400

        Automatic changelog update

    commit e460963
    Author: Alekshhh <[email protected]>
    Date:   Mon Mar 13 19:47:56 2023 +0200

        Added Warden's Hardsuit (#14521)

    commit e103fa9
    Author: PJBot <[email protected]>
    Date:   Mon Mar 13 13:46:51 2023 -0400

        Automatic changelog update

    commit c141700
    Author: Alekshhh <[email protected]>
    Date:   Mon Mar 13 19:45:47 2023 +0200

        Made Security & HOS Hardsuits Emit Yellow Light (#14522)

    commit 6430f35
    Author: router <[email protected]>
    Date:   Mon Mar 13 18:14:20 2023 +0300

        Add chameleon voice mask (#14203)

    commit 170e2d2
    Author: PJBot <[email protected]>
    Date:   Mon Mar 13 00:04:55 2023 -0400

        Automatic changelog update

    commit 21d15e3
    Author: Naive817 <[email protected]>
    Date:   Mon Mar 13 12:03:51 2023 +0800

        Blind (permanent, temporary or blindfolded) players no longer get flashed (#14487)

    commit e24a163
    Author: PJBot <[email protected]>
    Date:   Mon Mar 13 00:03:13 2023 -0400

        Automatic changelog update

    commit 9e38565
    Author: Whisper <[email protected]>
    Date:   Mon Mar 13 00:02:08 2023 -0400

        Science lockers now come with both a node scanner and an anomaly scanner. (#14490)

    commit 7d78de1
    Author: PJBot <[email protected]>
    Date:   Sun Mar 12 23:49:36 2023 -0400

        Automatic changelog update

    commit 49dccc6
    Author: Nylux <[email protected]>
    Date:   Mon Mar 13 04:48:32 2023 +0100

        added ability to get drunk to dionas (#14532) (#14537)

    commit 2728b7a
    Author: PJBot <[email protected]>
    Date:   Sun Mar 12 23:30:29 2023 -0400

        Automatic changelog update

    commit 65aca01
    Author: Vasilis The Pikachu <[email protected]>
    Date:   Mon Mar 13 04:29:26 2023 +0100

        Strip menu will no longer open when trying to wake sleeping players (#14319)

commit 57bc145
Author: Pspritechologist <[email protected]>
Date:   Thu Mar 16 17:39:51 2023 -0400

    Made Flatgrass functional, and continued work on it.

commit bcbf5d5
Merge: 1aea218 7a809d4
Author: Charcoal <[email protected]>
Date:   Thu Mar 16 16:14:48 2023 -0400

    Merge remote-tracking branch 'origin/TDMMap' into TDMMap

commit 1aea218
Author: Charcoal <[email protected]>
Date:   Thu Mar 16 16:14:40 2023 -0400

    Fence added to map

commit 7a809d4
Author: Pspritechologist <[email protected]>
Date:   Wed Mar 15 19:17:27 2023 -0400

    Tweaked lights more

commit 8b1852c
Author: Pspritechologist <[email protected]>
Date:   Wed Mar 15 17:30:29 2023 -0400

    Changed temp map name, and edited some lights

commit aa87330
Author: Pspritechologist <[email protected]>
Date:   Mon Mar 13 22:51:24 2023 -0400

    Added fences, fixed admin testing map, and more progress on TDM map

commit bf1f876
Author: Charcoal <[email protected]>
Date:   Mon Mar 13 20:11:24 2023 -0400

    Map Progress

commit 5b98652
Author: Pspritechologist <[email protected]>
Date:   Mon Mar 13 17:54:54 2023 -0400

    Part of the TDM map done between myself and Pengu.
  • Loading branch information
@Pspritechologist
Pspritechologist committed Apr 6, 2023
1 parent 7825f22 commit a31833e
Show file tree
Hide file tree
Showing 17 changed files with 57,496 additions and 96 deletions.
12 changes: 0 additions & 12 deletions Resources/Maps/Test/admin_test_arena.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,18 +317,6 @@ entities:
- pos: -8.5,7.5
parent: 104
type: Transform
- uid: 37
type: AirlockCommandLocked
components:
- pos: -0.5,-5.5
parent: 104
type: Transform
- uid: 38
type: AirlockCommandLocked
components:
- pos: -0.5,4.5
parent: 104
type: Transform
- uid: 39
type: WallRiveted
components:
Expand Down
57,270 changes: 57,270 additions & 0 deletions Resources/Maps/cm_flatgrass.yml
View file

Large diffs are not rendered by default.

57 changes: 57 additions & 0 deletions Resources/Prototypes/CM-SS14/Entities/Structures/Obstacles/fences.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
- type: entity
parent: BaseStructure
id: FenceBase
name: fence
description: A fence.
components:
- type: RangedDamageSound
soundGroups:
Brute:
collection:
MetalBulletImpact
soundTypes:
Heat:
collection:
MetalLaserImpact
- type: Sprite
sprite: CM-SS14/Structures/Obstacles/fence_marine.rsi
netsync: false
drawdepth: Walls
- type: Icon
sprite: CM-SS14/Structures/Obstacles/fence_marine.rsi
state: full
- type: Physics
bodyType: Static
- type: Fixtures
fixtures:
- shape:
!type:PhysShapeAabb
bounds: "-0.3,-0.3,0.3,0.3"
mask:
- FullTileMask
layer:
- WallLayer
density: 1000
- type: Repairable
- type: Damageable
damageContainer: Inorganic
damageModifierSet: FlimsyMetallic
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 35
behaviors:
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
- !type:SpawnEntitiesBehavior
spawn:
PartRodMetal1:
min: 0
max: 2
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: IconSmooth
key: walls
base: fence
64 changes: 32 additions & 32 deletions Resources/Prototypes/Entities/Objects/Power/lights.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@
- type: LightBulb
bulb: Bulb
color: "#FFD1A3" # 4000K color temp
lightEnergy: 1.0
lightRadius: 6
lightSoftness: 1.1
lightEnergy: 1.2
lightRadius: 8
lightSoftness: 0.9

- type: entity
parent: BaseLightTube
Expand All @@ -102,33 +102,33 @@
lightSoftness: 1
PowerUse: 25

- type: entity
parent: BaseLightTube
name: led light tube
description: A high power high energy bulb.
id: LedLightTube
components:
- type: LightBulb
color: "#EEEEFF"
lightEnergy: 1
lightRadius: 15
lightSoftness: 0.9
BurningTemperature: 350
PowerUse: 12
# - type: entity
# parent: BaseLightTube
# name: led light tube
# description: A high power high energy bulb.
# id: LedLightTube
# components:
# - type: LightBulb
# color: "#EEEEFF"
# lightEnergy: 1
# lightRadius: 15
# lightSoftness: 0.9
# BurningTemperature: 350
# PowerUse: 12

- type: entity
parent: BaseLightTube
name: exterior light tube
description: A high power high energy bulb for the depths of space. May contain mercury.
id: ExteriorLightTube
components:
- type: LightBulb
color: "#B4FCF0"
lightEnergy: 4.5
lightRadius: 12
lightSoftness: 0.5
BurningTemperature: 350
PowerUse: 100
# - type: entity
# parent: BaseLightTube
# name: exterior light tube
# description: A high power high energy bulb for the depths of space. May contain mercury.
# id: ExteriorLightTube
# components:
# - type: LightBulb
# color: "#B4FCF0"
# lightEnergy: 4.5
# lightRadius: 12
# lightSoftness: 0.5
# BurningTemperature: 350
# PowerUse: 100

- type: entity
parent: BaseLightTube
Expand All @@ -139,7 +139,7 @@
- type: LightBulb
color: "#FFAF38"
lightEnergy: 4
lightRadius: 10
lightSoftness: 0.5
lightRadius: 12
lightSoftness: 1
BurningTemperature: 350
PowerUse: 100
PowerUse: 140
4 changes: 3 additions & 1 deletion Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
name: airlock
description: It opens, it closes, and maybe crushes you.
components:
- type: Tag
tags:
- ForceNoFixRotations
- type: MeleeSound
soundGroups:
Brute:
Expand All @@ -13,7 +16,6 @@
- type: Sprite
netsync: false
sprite: Structures/Doors/Airlocks/Standard/celldoor.rsi
snapCardinals: false
layers:
- state: closed
map: ["enum.DoorVisualLayers.Base"]
Expand Down
111 changes: 60 additions & 51 deletions Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

#Basic lights
- type: entity
abstract: true
id: AlwaysPoweredWallLight
name: light
description: "An always powered light."
Expand Down Expand Up @@ -64,6 +65,7 @@
- Wallmount

- type: entity
abstract: true
name: light
description: "A light fixture. Draws power and produces light when equipped with a light tube."
id: PoweredlightEmpty
Expand Down Expand Up @@ -100,6 +102,7 @@
Toggle: []

- type: entity
abstract: true
id: Poweredlight
description: "A light fixture. Draws power and produces light when equipped with a light tube."
suffix: ""
Expand All @@ -113,53 +116,53 @@
types:
Heat: 5

#LED lights
- type: entity
id: PoweredlightLED
description: "A light fixture. Draws power and produces light when equipped with a light tube."
suffix: LED
parent: Poweredlight
components:
- type: PoweredLight
hasLampOnSpawn: LedLightTube
damage:
types:
Heat: 5
# #LED lights
# - type: entity
# id: PoweredlightLED
# description: "A light fixture. Draws power and produces light when equipped with a light tube."
# suffix: LED
# parent: Poweredlight
# components:
# - type: PoweredLight
# hasLampOnSpawn: LedLightTube
# damage:
# types:
# Heat: 5

- type: entity
parent: AlwaysPoweredWallLight
id: AlwaysPoweredLightLED
suffix: Always Powered, LED
components:
- type: PointLight
radius: 10
energy: 2.5
softness: 0.9
color: "#EEEEFF"
# - type: entity
# parent: AlwaysPoweredWallLight
# id: AlwaysPoweredLightLED
# suffix: Always Powered, LED
# components:
# - type: PointLight
# radius: 10
# energy: 2.5
# softness: 0.9
# color: "#EEEEFF"

#Exterior lights
- type: entity
id: PoweredlightExterior
description: "A light fixture. Draws power and produces light when equipped with a light tube."
suffix: Blue
parent: Poweredlight
components:
- type: PoweredLight
hasLampOnSpawn: ExteriorLightTube
damage:
types:
Heat: 5
# #Exterior lights
# - type: entity
# id: PoweredlightExterior
# description: "A light fixture. Draws power and produces light when equipped with a light tube."
# suffix: Blue
# parent: Poweredlight
# components:
# - type: PoweredLight
# hasLampOnSpawn: ExteriorLightTube
# damage:
# types:
# Heat: 5

- type: entity
parent: AlwaysPoweredWallLight
id: AlwaysPoweredLightExterior
suffix: Always Powered, Blue
components:
- type: PointLight
radius: 12
energy: 4.5
softness: 0.5
color: "#B4FCF0"
# - type: entity
# parent: AlwaysPoweredWallLight
# id: AlwaysPoweredLightExterior
# suffix: Always Powered, Blue
# components:
# - type: PointLight
# radius: 12
# energy: 4.5
# softness: 0.5
# color: "#B4FCF0"

#Sodium lights
- type: entity
Expand All @@ -173,16 +176,21 @@
damage:
types:
Heat: 5
- type: AmbientSound
volume: -6
range: 5
sound:
path: /Audio/Ambience/Objects/light_hum.ogg

- type: entity
parent: AlwaysPoweredWallLight
id: AlwaysPoweredLightSodium
suffix: Always Powered, Sodium
components:
- type: PointLight
radius: 10
radius: 12
energy: 4
softness: 0.5
softness: 1
color: "#FFAF38"

#Small lights
Expand All @@ -194,18 +202,19 @@
parent: AlwaysPoweredWallLight
components:
- type: AmbientSound
volume: -15
range: 2
volume: -8
range: 3
sound:
path: /Audio/Ambience/Objects/light_hum.ogg
- type: Sprite
sprite: Structures/Wallmounts/Lighting/light_small.rsi
state: on
- type: PointLight
energy: 1.0
radius: 6
softness: 1.1
energy: 1.2
radius: 8
softness: 0.9
enabled: true
color: "#FFE4CE"
- type: Damageable
damageContainer: Inorganic
- type: Destructible
Expand Down
28 changes: 28 additions & 0 deletions Resources/Prototypes/Maps/cm_flatgrass.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
- type: gameMap
id: CM_Flatgrass
mapName: 'CM Flatgrass'
mapPath: /Maps/cm_flatgrass.yml
minPlayers: 0
maxPlayers: 100
fallback: true
stations:
CM_Flatgrass:
mapNameTemplate: '{0} Jungle {1}'
nameGenerator:
!type:NanotrasenNameGenerator
prefixCreator: '14'
overflowJobs:
- Passenger
availableJobs:
Passenger: [ -1, -1 ]
Chef: [ 1, 1 ]
Captain: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
ChiefEngineer: [ 1, 1 ]
ChiefMedicalOfficer: [ 1, 1 ]
ResearchDirector: [ 1, 1 ]
HeadOfSecurity: [ 1, 1 ]
StationEngineer: [ 2, 4 ]
# MedicalDoctor: [ 2, 2 ]
SecurityOfficer: [ 4, 4 ]
SecurityCadet: [ 12, 24 ]
Binary file added Resources/Textures/CM-SS14/Structures/Obstacles/fence_marine.rsi/fence0.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/CM-SS14/Structures/Obstacles/fence_marine.rsi/fence1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/CM-SS14/Structures/Obstacles/fence_marine.rsi/fence2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/CM-SS14/Structures/Obstacles/fence_marine.rsi/fence3.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/CM-SS14/Structures/Obstacles/fence_marine.rsi/fence4.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/CM-SS14/Structures/Obstacles/fence_marine.rsi/fence5.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/CM-SS14/Structures/Obstacles/fence_marine.rsi/fence6.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/CM-SS14/Structures/Obstacles/fence_marine.rsi/fence7.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/CM-SS14/Structures/Obstacles/fence_marine.rsi/full.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit a31833e

Please sign in to comment.