-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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
Neck Slots #21169
Neck Slots #21169
Conversation
This can ONLY end well |
var/body_part = parse_zone(user.zone_selected) | ||
if(body_part) | ||
var/their = "their" | ||
switch(M.gender) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we have pronoun procs that automatically return things such as "his","her"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I didn't do this, I was copy/pasting shit from the other slots just to be certain on things I was unsure about.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Doesn't matter, you touch code it's your job to update it :P
@@ -1,4 +1,4 @@ | |||
/obj/item/clothing/tie | |||
/obj/item/clothing/tie //Ties moved to neck slot items, but leaving this as-is to avoid conflicts |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Probably worth nuking this path from orbit now, no need for it anymore.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I didn't change armbands, or medals, or the waistcoat.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh right, sure, it can live for now then.
one day we'll remove the shitty accessory system.
one day.
Alter the comment to mention it's still used for armbands/medals etc., rather than just "no conflict pls" :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Got it.
Looks ok overall, Travis is failing due to the tie path changes on metastation, so you'll have to swap those for the new paths (mostly just adding |
…e to armbands and such instead of just avoiding conflicts.
I did it for most maps, forgot to do metastation for some reason is all. |
Chowder is cool. |
Oh and this looks cool. |
Pet collar ❤️ |
@chowdermcarthor One thing to request, mind showing a UI shot? |
Fits in nicely |
So uh |
The previous system was shit Cheri. |
Certain items like ties should be fine to wear no matter what, pins and medals should require a jumpsuit, idk if you've already accounted for this |
It's not a change to the attachment system, really. It adds a new slot, a neck slot. The reason the attachment system was mentioned was because I moved some items from the attachment system to the neck slot. |
This is fucking sick yo |
https://i.gyazo.com/876e6059af2af40e5664a3ffae776b6e.png |
the tie inventory slot icon looks like a penis |
@@ -55,7 +55,7 @@ | |||
|
|||
/obj/item/clothing/tie/proc/on_uniform_dropped(obj/item/clothing/under/U) | |||
return | |||
|
|||
/* |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove commented out code
@RemieRichards not an argument |
It's a lot less confusing for new players |
Attachments were snowflakey and annoying to deal with to the point that no one ever really bothered using any, now they would work like any other item slot |
Can't wait for exploding collars |
@Shapsy Accessory items still exist though, so any flaws with THAT system still exist on top of having a new slot taking screen real estate. this isn't a replacement, it's an addition. |
I believe abstract "accessory" slot would be better for all the "does not really fit any category" equipment like ties,holsters and similar. Not sure how handling of layers would work in that case though. |
@@ -98,7 +102,8 @@ | |||
#define HAND_LEFT 512 | |||
#define HAND_RIGHT 1024 | |||
#define HANDS 1536 | |||
#define FULL_BODY 2047 | |||
#define NECK 2048 | |||
#define FULL_BODY 4096 //2047 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This needs to be 4095 to fulfill the functionality of the old flag. Here's the reason:
- Old FULL_BODY = 2047 corresponded to bitflag (aka binary form of) (111 1111 1111 - meaning it's considered to cover every bodypart);
- New FULL_BODY = 4096 corresponds to bitflag (1 0000 0000 0000), which means it no longer is considered to cover the entire body, logic-wise, and checks such as
cover_flags & HAND_LEFT
(or equivalent) will fail under the new system for things with this flag;
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, so that's why it was that number, I wasn't sure why it was that, I'll change it as soon as I can.
But yeah big 👍 to this, makes coding special neck items much easier |
finally i can wear a medal and scarf without being weighed down |
# Conflicts: # _maps/map_files/PubbyStation/PubbyStation.dmm
@Cheridan moving the majority of the items under that system to this (which this PR does, neck items were atleast 70% of accessories) increases the odds we'll be able to get RID OF the shit system. |
What if accessories was a mini inventory with 3 slots |
@Iamgoofball that sounds cool. also should medals be pinned on like right now or be neck slots? because right now they're more like pins. |
Gah fuck, didn't mean to upload that to this. |
Write a commit to revert your most recent change. |
git checkout origin/master -- [filename] gets the file from the main repo and replaces your local file with it. use this on the unwanted changed file and commit it might be upstream/master or whatever you named this repo in your local git |
👍 |
🆑 Chowder McArthor
add: Added a neck slot.
tweak: Modified some of the attachment items (ties, scarves, etc) to be neck slot items instead.
/:cl: