Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream Merge 6/7/2024 #20

Merged
merged 52 commits into from
Jun 8, 2024
Merged
Changes from 1 commit
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
5b8d8bd
Sleep deprived coding
VMSolidus May 5, 2024
c964f91
guhh
VMSolidus May 5, 2024
84afa69
updating mimic rule
VMSolidus May 8, 2024
7126614
update mimic spawns
VMSolidus May 8, 2024
dcbb94d
Guh
VMSolidus May 11, 2024
3a1bf4a
Update submarine
VMSolidus May 11, 2024
f293866
rsi validator
VMSolidus May 11, 2024
2291292
Revert "rsi validator"
VMSolidus May 11, 2024
e5b5765
guhhhhh
VMSolidus May 11, 2024
bbc73ed
Update vending_machines.yml
VMSolidus May 11, 2024
9e6c56c
Update vending_machines.yml
VMSolidus May 11, 2024
35204d3
Update vending_machines.yml
VMSolidus May 11, 2024
e1e7d1f
Update vending_machines.yml
VMSolidus May 11, 2024
bcbe1ad
Update vending_machines.yml
VMSolidus May 11, 2024
7f1f618
Update vending_machines.yml
VMSolidus May 11, 2024
7fdfea5
found it
VMSolidus May 12, 2024
01186cf
Fuck the test
VMSolidus May 12, 2024
8455835
Update bay12barbershop.yml
VMSolidus May 12, 2024
f9c509a
Update vending_machines.yml
VMSolidus May 12, 2024
6458ed0
more point lights
VMSolidus May 12, 2024
1d2bd21
More work on shader
VMSolidus May 12, 2024
1925472
update cola and coffee
VMSolidus May 14, 2024
f27b719
engivend done
VMSolidus May 14, 2024
e8fc219
Chunk of sprites adjusted. Some may be slightly misaligned :)
Pspritechologist May 14, 2024
d5afb68
Merge branch 'master' into Vendors
VMSolidus May 30, 2024
0f4cecf
wallmed done
VMSolidus May 30, 2024
9122ae1
guh
VMSolidus May 30, 2024
65a58f4
FINALLY DONE
VMSolidus May 30, 2024
386057a
Merge branch 'master' into FIX-MIMICS
VMSolidus May 31, 2024
8033d02
Merge branch 'master' into Additional-Loadout-Items
DangerRevolution May 31, 2024
770a2b0
YE
VMSolidus May 31, 2024
0edd396
Merge branch 'master' into Additional-Loadout-Items
VMSolidus Jun 3, 2024
8375afc
Update ciggy discreption
VMSolidus Jun 3, 2024
6ca58bf
Update packs.yml
VMSolidus Jun 3, 2024
f24dcfe
Update outerClothing.yml
VMSolidus Jun 3, 2024
c588ac5
update categories
VMSolidus Jun 3, 2024
c68218b
Add bluesec and reorganize security
VMSolidus Jun 3, 2024
11c49a0
Adding prescription glasses
VMSolidus Jun 3, 2024
0c0cc24
Update medical.yml
VMSolidus Jun 3, 2024
d573549
Apply suggestions from code review
VMSolidus Jun 8, 2024
68461a6
Update MobReplacementRuleSystem.cs
VMSolidus Jun 8, 2024
b2f4da6
Update MobReplacementRuleSystem.cs
VMSolidus Jun 8, 2024
f5bfb93
Merge remote-tracking branch 'EE-Personal/FIX-MIMICS' into Sekrit-stuff
VMSolidus Jun 8, 2024
8763409
Merge remote-tracking branch 'EE-Personal/Additional-Loadout-Items' i…
VMSolidus Jun 8, 2024
36d7208
Merge remote-tracking branch 'EE-Personal/Harpy-Markings-Wave-2' into…
VMSolidus Jun 8, 2024
862b26c
Merge remote-tracking branch 'EE-Personal/Vendors' into Sekrit-stuff
VMSolidus Jun 8, 2024
ce16969
Update fitness.yml
VMSolidus Jun 8, 2024
6ed6530
Update barbershop.yml
VMSolidus Jun 8, 2024
6972cd1
Update drinks-cartons.yml
VMSolidus Jun 8, 2024
b39282c
aaaaaaaaaaaaaaaaaa
VMSolidus Jun 8, 2024
62f6090
MORE OF THESE? They're being upstreamed by the way
VMSolidus Jun 8, 2024
1b8d149
Update drinks.yml
VMSolidus Jun 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update bay12barbershop.yml
  • Loading branch information
VMSolidus committed May 12, 2024
commit 84558355bc65da1dc77ea0266314b93f6e0a4ad6
Original file line number Diff line number Diff line change
@@ -31,6 +31,6 @@
description: Let's hope it's not a medical practice...
components:
- type: Sprite
sprite: Strucures/Specific/barbershop.rsi
sprite: Structures/Specific/barbershop.rsi
state: thesnip
snapCardinals: false