Blatant Reference Hardsuits and more #130
Conversation
put shit in the arc namespace. probably.
Unkinkied the shock collar, Added the Frying Pan, and Gold Frying pan as weapons. Also a new hardsuit. And some other fun bullshit i guess. lot of this was made by federals request.
| parent: ClothingHeadBase | ||
| id: ClothingHeadHatkid | ||
| name: finder's hat | ||
| description: A fancy little hat to wear when looking for time |
There was a problem hiding this comment.
i copy and pasted you fuck you should of said finders hat instead of finder's hat then
There was a problem hiding this comment.
a: add an apostrophe in finders to make it finder's
b: add a period in the description
Resources/Textures/_Arc/Clothing/under/blacksocks.rsi/meta.json
Outdated
Show resolved
Hide resolved
Resources/Textures/_Arc/Objects/Weapons/Melee/fryingpan.rsi/meta.json
Outdated
Show resolved
Hide resolved
Resources/Textures/_Arc/Objects/Weapons/Melee/goldpan.rsi/meta.json
Outdated
Show resolved
Hide resolved
thats all.
|
that commit should fix federals gripes about copywrites. |
suffering
|
merge unconflicted. probably |
|
Conflict in battery_guns.yml needs resolving otherwise gucci |
| parent: ClothingHeadBase | ||
| id: ClothingHeadHatkid | ||
| name: finder's hat | ||
| description: A fancy little hat to wear when looking for time |
There was a problem hiding this comment.
a: add an apostrophe in finders to make it finder's
b: add a period in the description
Resources/Textures/_Arc/Clothing/Head/Hats/teamcaptain.rsi/equipped-BACKPACK.png
Outdated
Show resolved
Hide resolved
Cant try and resolve it. Dont have write access. pretty sure its just "use masters version" as opposed to ours. But let me fix federals issues. |
there you go.
You MOVED THE FILE on your branch hence the conflict. Either move it back or follow Git's instructions to merge. |
where the FUCK would i move it back to. Also i do not get instructions to fix it because i do not have write access to resolve conflicts Move it back to wherever it was I guess! Check the Files Changed tab in Github. Here's the instructions Git gave me:
|
bruhmogus
dismissed
their stale review
literally nothing changed since last time
those are instructions on how to OPEN THE EDITOR ITSELF... im going to look at files changed myself then i guess. |
nightmarenightmarenightmarenightmarenightmarenightmarenightmarenightmarenightmarenightmarenightmarenightmarenightmarenightmarenightmarenightmarenightmarenightmarenightmarenightmarenightmarenightmare
|
FUCK IT. that should of fixed it. I THINK. HELL if i know what was wrong. apparently "FILE name changed" was all that was different and maybe thats a folder. i don't goddamn know |
|
Resources/Prototypes/_Arc/Entities/Objects/Weapons/Battery/battery_guns.yml is the path you need to move it to I think Resources/Prototypes/_Arc/Entities/Objects/Weapons/Guns/battery_guns.yml is the path YOU moved it to. |
where "you moved it to" and where it needs to be was where it was before commit: unmergeconflict i guess and it still conflicted. The first time you moved it was Resources/Prototypes/_Arc/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml The next move was to GITHUB says the conflict is Resources/Prototypes/_Arc/Entities/Objects/Weapons/Battery/battery_guns.yml |
|
i swear to god it was because the folder was battery and not batterys. i am going to murder someone |
|
oh yeah and also theres fucking gulos changes which is F U N (its not i want to die) |
|
Dusty I am starting to question your ability to read
❌ Try again! |
|
Safe to merge. solve the conflict by favoring my modifcation of the folders over master branches. |
|
You merged the changes fine but you still cant move the file, I said you have to move it back for a reason
❌ Try again! (I can't do that from Github) |
they will not find the body.
|
p a i n. |
|
The Pain:tm: is over now, you can sleeb |
Description
Description.
Federal requested several changes which i made.
Including a new hardsuit thats not at all a reference nope no sirie
Two new hats.
And also a new piece of shiny cookware.
TODO
Media
Changelog
🆑