From 426f043d4565d2ed5beb783503400fe66e5381f9 Mon Sep 17 00:00:00 2001 From: router Date: Thu, 3 Mar 2022 13:11:35 +0300 Subject: [PATCH] Add capitalism (#6617) Co-authored-by: metalgearsloth --- .../Entities/Objects/Misc/space_cash.yml | 114 ++++++++ .../Prototypes/Roles/Jobs/Civilian/lawyer.yml | 4 +- .../Effects/crayondecals.rsi/meta.json | 271 +++++++++--------- .../Objects/Economy/cash.rsi/cash.png | Bin 0 -> 410 bytes .../Objects/Economy/cash.rsi/cash_10.png | Bin 0 -> 422 bytes .../Objects/Economy/cash.rsi/cash_100.png | Bin 0 -> 410 bytes .../Objects/Economy/cash.rsi/cash_1000.png | Bin 0 -> 439 bytes .../Objects/Economy/cash.rsi/cash_1000000.png | Bin 0 -> 2462 bytes .../Objects/Economy/cash.rsi/cash_500.png | Bin 0 -> 432 bytes .../Objects/Economy/cash.rsi/meta.json | 43 +++ 10 files changed, 294 insertions(+), 138 deletions(-) create mode 100644 Resources/Prototypes/Entities/Objects/Misc/space_cash.yml create mode 100644 Resources/Textures/Objects/Economy/cash.rsi/cash.png create mode 100644 Resources/Textures/Objects/Economy/cash.rsi/cash_10.png create mode 100644 Resources/Textures/Objects/Economy/cash.rsi/cash_100.png create mode 100644 Resources/Textures/Objects/Economy/cash.rsi/cash_1000.png create mode 100644 Resources/Textures/Objects/Economy/cash.rsi/cash_1000000.png create mode 100644 Resources/Textures/Objects/Economy/cash.rsi/cash_500.png create mode 100644 Resources/Textures/Objects/Economy/cash.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml b/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml new file mode 100644 index 0000000000..e6508f9ff2 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml @@ -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 diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index bf986ef773..5f23432b69 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -14,10 +14,10 @@ - type: startingGear id: LawyerGear 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 shoes: ClothingShoesColorBlack id: LawyerPDA ears: ClothingHeadsetService - #TODO add copy of space law + # TODO add copy of space law diff --git a/Resources/Textures/Effects/crayondecals.rsi/meta.json b/Resources/Textures/Effects/crayondecals.rsi/meta.json index 2f35a33945..eb33bb4909 100644 --- a/Resources/Textures/Effects/crayondecals.rsi/meta.json +++ b/Resources/Textures/Effects/crayondecals.rsi/meta.json @@ -4,540 +4,539 @@ "x": 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", "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" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Economy/cash.rsi/cash.png b/Resources/Textures/Objects/Economy/cash.rsi/cash.png new file mode 100644 index 0000000000000000000000000000000000000000..91c8157428d944fe78221be75705987c28d11ab9 GIT binary patch literal 410 zcmV;L0cHM)P)VQ!Pj5=V{0izBWbpY88NU-Jnzu@q9Mw&Q) z&6(~0AH_d-HAV{ZF)UL5`Ja#l|K|L|>qwj-;AH5;@a63nhG{l87~bDZ2a8p|KFDzH z;5i1nAUg&rv%3sVr<@oLtvdwf!_<~tHvzMGgn1bDo!>{ueYhO}GcfCj2GFpxa6>^M z17gF}!1y4wFfouim>RMj05SyRb7adwG|PP!1|CBmpo*7ZF_wc6KFFaUN5Is9Xog1= zH~?gbpv_E%FW?a1As7N+3#lCfFkgYwfG8vl;0ghdh3FwhQ3${ikjXL-*^Q7;gvdR6 zAj+`s{XRG!1Y94TLZ~Cca=Z=z`4le@Bti`k`~pIf9q{kXKY|7?KkSS$Z-HMfEvXxMGl}A7pd1-T(jq07*qoM6N<$ Ef`oXXmjD0& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Economy/cash.rsi/cash_10.png b/Resources/Textures/Objects/Economy/cash.rsi/cash_10.png new file mode 100644 index 0000000000000000000000000000000000000000..14c2ec801c760a5d22d774e6f6eccb5753286d15 GIT binary patch literal 422 zcmV;X0a^ZuP)VQ!Pj5=V{0izBWbpY88NU-Jnzu@q9Mw&Q) z#lrPJ7rzW%jgflW7}jw`{3m3=r=9chIud6Hm{=JwJbwL_VP()HhW9tq!D1O#*%|Ji zInH3`>BAu9b%4Qy$AIC`_ALyj+Db{1PXq58W01e0n88pr3sKc$T1-GGqj(9 zol^0+=7T0U;lFn}H;N(*Yo#5(31iA@~07*qoM6N<$f`+iBwEzGB literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Economy/cash.rsi/cash_100.png b/Resources/Textures/Objects/Economy/cash.rsi/cash_100.png new file mode 100644 index 0000000000000000000000000000000000000000..06244e70df8702c685786cbe77ccd374f495336f GIT binary patch literal 410 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv(mfq~J- z)5S5QVoq|RM1sMqhCucntAs0zi}@r<8E*1J=HGm2|JdGhkCd|R zH-j7tp)d0%u*(0_Kl<8Zj$%Sq(t!`Ju5!2i{QTT#&;FTwV%o2M9RBd&WF?!ivOn9( z4aq#q*m)%U=H5QHq5ivN+mRzF8=_KvJzOl_a;N<^qrquMw$9GZhM!4ELJrQV2Xkgf zO?awsA^c#|Lk{)y{7j0?+7Z`8Ts-YkY;LnRoqx& zbf+jsv0+Zwgrk~e3@3~t0-P=}a2xO@v@vM-Hau~B$t=ceFsre#$)w=d8CC<{&g1F@ zg>Gz~8}4ily??-@Lw*kHME-M04huUOEo2!!X(~GONVV-xv3T%2{t%nK{l`v?(iVm= z_CEVQ!Pj5=V{0izBWbpY88NU-Jnzu@q9Mw&Rl zm6`d!`2YWSHAY(SG5k6D6Tc!LSn}^5UPs~#0ex*vhL@kdFhtG&$ngGVI#_Ib#|nmv zPo6NiX=yM>g?(et-=WE{>)H*5&fUBW%M$s)YWL<#GdNFt3g*9f{FspYa615IImjS! zzAa$BI3EuKC}cov1_mZD4YC{rKynNWAE9y({tE`e0H*^$2E4x+fnqs`e#ywlpbxg} z8(6H|^$FM!FpFWK0OL~>0)px@fiyqda%>?0ODnJtfJDVpup=lAfn|vd&@>PM76YXL z^boiROp*pLg3=n>tMRi1w?iu90rxsTO|slAA@`eOEV z24Vs3C}1R<#fecvmIEHK5H@)EiBCkSWB5yk18)BOL(pVP2G;+?s3Qc(E{ds93{&I) hYJpJ)j5=V{0RTD`sR!kvoU#A_002ovPDHLkV1nc?vpfI* literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Economy/cash.rsi/cash_1000000.png b/Resources/Textures/Objects/Economy/cash.rsi/cash_1000000.png new file mode 100644 index 0000000000000000000000000000000000000000..b7fcc16d2fd52604fdf597cc0f73910c5d674202 GIT binary patch literal 2462 zcmbW3doSUX5Oq!)9EX%p}HOFy?+{|9k#9Yqi$rd7t&X>-*2UzVCOf=XyvG)9vyaInABP9@(d+eU2)xa z4pwD#$H-^5UnbS_R&as-jz`8@^RC~@ud;XcaP{xH7tg3c5Q(Z((qaW?!ikMT-4M%- zO4~E~Img+Q{(|sNdn1Ey*x6I}{9pRP^6Xita8|53irwE=ynIrt_2OFHH@+h{jJS@o=y{b+-FI>^4u%R47@SXA z6=*a*R*&rT!vJ)v@mWR|m<#OY(K|>$Ew4Tr1)BSu`9K=&&ew za<`}OaICm&wTMofqko=#0$-2gz7OO{F{+*t?hZX5A=XQ*&-60+4Zho2qkc@g|C%pB zst=J5O(gu0SBOLcL5VmPK9`?+t& z2&i&Bv=J$AJO+n3z~54a0C4b)|Wkbn!jNGWVyhC0&f6D3ud-mH44 z{|u=wb2S=jS*>(|m*IbL`{ODe%{O!(h%_ay78LJ_WN+F@;roV;qq>O8?xwlNp8g z*p8O`dg~ob?fZV*`Fkl{wZIQ@hD=@BcnN;-Ot^ycH|L9xlh)EbvTS8<&Bsc%u+(cD zzdkr6T`oLmq1uB)&(zm^{ zmv4uM+NUNcq@kbFWanG1txr!UKd9==*>@p+45AkbHLu~lzxpaYF7rN2s^lm)PBt!7 zfa{c^E$@{B^+H|2#$=(}qGZzt8Y?2aJY|;6oc*^AW5s5J;VCh`4rY}Qo(rNH>kicM z+`MB`YJI)hok~XtsFrB9S70uFf}QYJ|0$jFtQlZCVgT#fyW08DNWXsjWlop|(wXr6 zTP6?UxwZ$YO=;QCYnVK!Pi`lqq@6OkC)k?t=+(x2W@@4U3-K7DITTc zrZFC@bQBH=X07K=tySEFkT|QUy(e11Pu;y5iVoJr*C4=Kk?<-+hIRh1E>$CuU)^K_ ztgbFXd|oA>)&Xm=7Z8NG8kEYlj3-hpL2rgJw-LBz`9e6?^G%AolkI7(aH9oKx@O$m zjF%OTUd3Pes(uaCAZ_Vbrdj!?9vlRxK!3xJBM;W2dhprK3lvn8m{S4K?l&Byro=TA zES;6{u6GdE9hb%*Z7RFamSYcP6Udn9ZnTf(-W8iF{wsCRUA*!=-M?mDwsaxcCq|Xf z<$0qSc3ER%mLBlRp8hMMwXwo?8`emq;5@u%gLQ3hf0VESaI zA}#-(T07TA8;}Dt%WJ(J$3uZ1#1-wGDGvvodq$=}hf3hLw}NV?V#C@>LfRzA_%#_M zL-^Dzn6o9432&-o$Q$%)r)aoOwd_7_@}#@+rc^=2yR{7qgRO(fm`5#fhISg|S1x{} z`I=HID#O~Lq@K#F+~DFrh1YbC9&U&BL&_!X4b=2_1$p?)BGPntzGYrqU2n1Sz_2GG z92#{NXZmt$c70r9-tdc? zKlm*on*c)}A5`}#k&TH~?H#GYFW?v%^8#oJWugn!Hs+ZiK_^{t=hezOT1v8xec5;lmt|V2g0d| zjHWY^(9=g&vg;lfS%8S{gWa%(&WX3MkO(Fv)hVmPZd}9Kc!JVd6{h|SzYa`ejjE)Q zh&5S8Xq3a;4yS!xYcl+maM0s<@rcPwuVQ!Pj5=V{0izBWbpY88NU-Jnzu@q9Mw&Rl zg~j#1%s&~t8Y3;XF)$pB_)o}!1^?#bbtKLZ(A3vtc=zEQL-^bo4DWBIgT;1rF*2Ne ze3rpg*Ofsk>;Qx29!&<<-Zrq@%H#~NT4eg=!j;h0k^XMV0lpb z07U~xk6YPeFwMX~K^nMz@j94>#N#WtxC{`2D5qcJ9qte6xoDKl_ln@|B z4Z}Y&9Psl03xeh@Kk