Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add capitalism (#6617)

Browse Source 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
router
2022-03-03 13:11:35 +03:00
committed by GitHub
parent 9cd0568f49
commit 426f043d45
10 changed files with 294 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
Resources/Prototypes/Entities/Objects/Misc/space_cash.yml Normal file
View File

@@ -0,0 +1,114 @@
- type: entity
parent: BaseItem
id: SpaceCash
name: credit
description: You gotta have money.
components:
- type: Material
materials:
- Credit
- type: Stack
stackType: Credit
max: 1000000 # if you somehow get this rich consider buying a second station
count: 1
- type: Sprite
sprite: Objects/Economy/cash.rsi
netsync: false
state: cash
- type: Physics
bodyType: Dynamic
- type: Fixtures
fixtures:
- mass: 5
shape:
!type:PhysShapeAabb
bounds: "-0.35,-0.2,0.25,0.1"
mask:
- Impassable
- VaultImpassable
- type: Appearance
visuals:
- type: StackVisualizer
# TODO: This won't work because stackvisualizer works based off of an even count and not denominations.
# Ideally we'd just be able to specify at what count does the new layer take place e.g.
# - 10: cash_10
# - 100: cash_100
stackLayers:
- cash
- cash_10
- cash_100
- cash_500
- cash_1000
- cash_1000000
- type: material
id: Credit
name: credit
stack: Credit
icon: /Textures/Objects/Economy/cash.rsi/cash.png
- type: stack
id: Credit
name: credit
icon: /Textures/Objects/Economy/cash.rsi/cash.png
spawn: SpaceCash
- type: entity
parent: SpaceCash
id: SpaceCash10
name: credit
suffix: 10
components:
- type: Icon
sprite: Objects/Economy/cash.rsi
state: cash_10
- type: Stack
count: 10
- type: entity
parent: SpaceCash
id: SpaceCash100
name: credit
suffix: 100
components:
- type: Icon
sprite: Objects/Economy/cash.rsi
state: cash_100
- type: Stack
count: 100
- type: entity
parent: SpaceCash
id: SpaceCash500
name: credit
suffix: 500
components:
- type: Icon
sprite: Objects/Economy/cash.rsi
state: cash_500
- type: Stack
count: 500
- type: entity
parent: SpaceCash
id: SpaceCash1000
name: credit
suffix: 1000
components:
- type: Icon
sprite: Objects/Economy/cash.rsi
state: cash_1000
- type: Stack
count: 1000
- type: entity
parent: SpaceCash
id: SpaceCash1000000
name: credit
suffix: 1000000
components:
- type: Icon
sprite: Objects/Economy/cash.rsi
state: cash_1000000
- type: Stack
count: 1000000

4
Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
View File

@@ -14,10 +14,10 @@
- type: startingGear - type: startingGear
id: LawyerGear id: LawyerGear
equipment: equipment:
jumpsuit: ClothingUniformJumpsuitLawyerBlack #TODO change jumpsuit to randomiser of the 4 variants jumpsuit: ClothingUniformJumpsuitLawyerBlack # TODO change jumpsuit to randomiser of the 4 variants
back: ClothingBackpackBriefcaseFilled back: ClothingBackpackBriefcaseFilled
shoes: ClothingShoesColorBlack shoes: ClothingShoesColorBlack
id: LawyerPDA id: LawyerPDA
ears: ClothingHeadsetService ears: ClothingHeadsetService
#TODO add copy of space law # TODO add copy of space law

269
Resources/Textures/Effects/crayondecals.rsi/meta.json
View File

@@ -4,539 +4,538 @@
"x": 32, "x": 32,
"y": 32 "y": 32
}, },
"license": "CC 3.0 BY-SA", "license": "CC-BY-SA-3.0",
"copyright": "From https://github.com/tgstation/tgstation/blob/master/icons/effects/crayondecal.dmi at c6803492ab2a5e523aae7b9b1a9e847ba155f1cf", "copyright": "From https://github.com/tgstation/tgstation/blob/master/icons/effects/crayondecal.dmi at c6803492ab2a5e523aae7b9b1a9e847ba155f1cf",
"states": [ "states": [
{ {
"name": "0", "name": "0"
}, },
{ {
"name": "1", "name": "1"
}, },
{ {
"name": "2", "name": "2"
}, },
{ {
"name": "3", "name": "3"
}, },
{ {
"name": "4", "name": "4"
}, },
{ {
"name": "5", "name": "5"
}, },
{ {
"name": "6", "name": "6"
}, },
{ {
"name": "7", "name": "7"
}, },
{ {
"name": "8", "name": "8"
}, },
{ {
"name": "9", "name": "9"
}, },
{ {
"name": "Blasto", "name": "Blasto"
}, },
{ {
"name": "Clandestine", "name": "Clandestine"
}, },
{ {
"name": "Cyber", "name": "Cyber"
}, },
{ {
"name": "Diablo", "name": "Diablo"
}, },
{ {
"name": "Donk", "name": "Donk"
}, },
{ {
"name": "Gene", "name": "Gene"
}, },
{ {
"name": "Gib", "name": "Gib"
}, },
{ {
"name": "Max", "name": "Max"
}, },
{ {
"name": "Newton", "name": "Newton"
}, },
{ {
"name": "North", "name": "North"
}, },
{ {
"name": "Omni", "name": "Omni"
}, },
{ {
"name": "Osiron", "name": "Osiron"
}, },
{ {
"name": "Prima", "name": "Prima"
}, },
{ {
"name": "Psyke", "name": "Psyke"
}, },
{ {
"name": "Sirius", "name": "Sirius"
}, },
{ {
"name": "Sleeping Carp", "name": "Sleeping Carp"
}, },
{ {
"name": "Tunnel", "name": "Tunnel"
}, },
{ {
"name": "Waffle", "name": "Waffle"
}, },
{ {
"name": "Zero-G", "name": "Zero-G"
}, },
{ {
"name": "a", "name": "a"
}, },
{ {
"name": "ampersand", "name": "ampersand"
}, },
{ {
"name": "amyjon", "name": "amyjon"
}, },
{ {
"name": "antilizard", "name": "antilizard"
}, },
{ {
"name": "arrow", "name": "arrow"
}, },
{ {
"name": "b", "name": "b"
}, },
{ {
"name": "beepsky", "name": "beepsky"
}, },
{ {
"name": "biohazard", "name": "biohazard"
}, },
{ {
"name": "blueprint", "name": "blueprint"
}, },
{ {
"name": "body", "name": "body"
}, },
{ {
"name": "bottle", "name": "bottle"
}, },
{ {
"name": "brush", "name": "brush"
}, },
{ {
"name": "c", "name": "c"
}, },
{ {
"name": "carp", "name": "carp"
}, },
{ {
"name": "cat", "name": "cat"
}, },
{ {
"name": "chevron", "name": "chevron"
}, },
{ {
"name": "clawprint", "name": "clawprint"
}, },
{ {
"name": "clown", "name": "clown"
}, },
{ {
"name": "comma", "name": "comma"
}, },
{ {
"name": "corgi", "name": "corgi"
}, },
{ {
"name": "credit", "name": "credit"
}, },
{ {
"name": "cyka", "name": "cyka"
}, },
{ {
"name": "d", "name": "d"
}, },
{ {
"name": "danger", "name": "danger"
}, },
{ {
"name": "disk", "name": "disk"
}, },
{ {
"name": "dot", "name": "dot"
}, },
{ {
"name": "dwarf", "name": "dwarf"
}, },
{ {
"name": "e", "name": "e"
}, },
{ {
"name": "electricdanger", "name": "electricdanger"
}, },
{ {
"name": "end", "name": "end"
}, },
{ {
"name": "engie", "name": "engie"
}, },
{ {
"name": "equals", "name": "equals"
}, },
{ {
"name": "evac", "name": "evac"
}, },
{ {
"name": "exclamationmark", "name": "exclamationmark"
}, },
{ {
"name": "f", "name": "f"
}, },
{ {
"name": "face", "name": "face"
}, },
{ {
"name": "fireaxe", "name": "fireaxe"
}, },
{ {
"name": "firedanger", "name": "firedanger"
}, },
{ {
"name": "food", "name": "food"
}, },
{ {
"name": "footprint", "name": "footprint"
}, },
{ {
"name": "g", "name": "g"
}, },
{ {
"name": "ghost", "name": "ghost"
}, },
{ {
"name": "guy", "name": "guy"
}, },
{ {
"name": "h", "name": "h"
}, },
{ {
"name": "heart", "name": "heart"
}, },
{ {
"name": "i", "name": "i"
}, },
{ {
"name": "j", "name": "j"
}, },
{ {
"name": "k", "name": "k"
}, },
{ {
"name": "l", "name": "l"
}, },
{ {
"name": "largebrush", "name": "largebrush"
}, },
{ {
"name": "like", "name": "like"
}, },
{ {
"name": "line", "name": "line"
}, },
{ {
"name": "m", "name": "m"
}, },
{ {
"name": "matt", "name": "matt"
}, },
{ {
"name": "med", "name": "med"
}, },
{ {
"name": "minus", "name": "minus"
}, },
{ {
"name": "n", "name": "n"
}, },
{ {
"name": "nay", "name": "nay"
}, },
{ {
"name": "o", "name": "o"
}, },
{ {
"name": "p", "name": "p"
}, },
{ {
"name": "pawprint", "name": "pawprint"
}, },
{ {
"name": "peace", "name": "peace"
}, },
{ {
"name": "percent", "name": "percent"
}, },
{ {
"name": "plus", "name": "plus"
}, },
{ {
"name": "pound", "name": "pound"
}, },
{ {
"name": "prolizard", "name": "prolizard"
}, },
{ {
"name": "q", "name": "q"
}, },
{ {
"name": "questionmark", "name": "questionmark"
}, },
{ {
"name": "r", "name": "r"
}, },
{ {
"name": "radiation", "name": "radiation"
}, },
{ {
"name": "revolution", "name": "revolution"
}, },
{ {
"name": "rune1", "name": "rune1"
}, },
{ {
"name": "rune2", "name": "rune2"
}, },
{ {
"name": "rune3", "name": "rune3"
}, },
{ {
"name": "rune4", "name": "rune4"
}, },
{ {
"name": "rune5", "name": "rune5"
}, },
{ {
"name": "rune6", "name": "rune6"
}, },
{ {
"name": "s", "name": "s"
}, },
{ {
"name": "safe", "name": "safe"
}, },
{ {
"name": "scroll", "name": "scroll"
}, },
{ {
"name": "shop", "name": "shop"
}, },
{ {
"name": "shortline", "name": "shortline"
}, },
{ {
"name": "shotgun", "name": "shotgun"
}, },
{ {
"name": "skull", "name": "skull"
}, },
{ {
"name": "slash", "name": "slash"
}, },
{ {
"name": "smallbrush", "name": "smallbrush"
}, },
{ {
"name": "snake", "name": "snake"
}, },
{ {
"name": "space", "name": "space"
}, },
{ {
"name": "splatter", "name": "splatter"
}, },
{ {
"name": "star", "name": "star"
}, },
{ {
"name": "stickman", "name": "stickman"
}, },
{ {
"name": "t", "name": "t"
}, },
{ {
"name": "taser", "name": "taser"
}, },
{ {
"name": "thinline", "name": "thinline"
}, },
{ {
"name": "toilet", "name": "toilet"
}, },
{ {
"name": "toolbox", "name": "toolbox"
}, },
{ {
"name": "trade", "name": "trade"
}, },
{ {
"name": "u", "name": "u"
}, },
{ {
"name": "uboa", "name": "uboa"
}, },
{ {
"name": "v", "name": "v"
}, },
{ {
"name": "w", "name": "w"
}, },
{ {
"name": "x", "name": "x"
}, },
{ {
"name": "y", "name": "y"
}, },
{ {
"name": "z", "name": "z"
} }
] ]

BIN
Resources/Textures/Objects/Economy/cash.rsi/cash.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 410 B

BIN
Resources/Textures/Objects/Economy/cash.rsi/cash_10.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 422 B

BIN
Resources/Textures/Objects/Economy/cash.rsi/cash_100.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 410 B

BIN
Resources/Textures/Objects/Economy/cash.rsi/cash_1000.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 439 B

BIN
Resources/Textures/Objects/Economy/cash.rsi/cash_1000000.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
Resources/Textures/Objects/Economy/cash.rsi/cash_500.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 432 B

43
Resources/Textures/Objects/Economy/cash.rsi/meta.json Normal file
View File

@@ -0,0 +1,43 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-NC-SA-3.0",
"copyright": "Taken from https://github.com/goonstation/goonstation at commit b951a2c12d967af1295a3e6d33a861e7e1f21299.",
"states": [
{
"name": "cash"
},
{
"name": "cash_10"
},
{
"name": "cash_100"
},
{
"name": "cash_500"
},
{
"name": "cash_1000"
},
{
"name": "cash_1000000",
"delays": [
[
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2
]
]
}
]
}