Neck Slots #21169

chowdermcarthor · 2016-10-24T03:23:52Z

🆑 Chowder McArthor
add: Added a neck slot.
tweak: Modified some of the attachment items (ties, scarves, etc) to be neck slot items instead.
/:cl:

Cyberboss · 2016-10-24T03:26:48Z

This can ONLY end well

RemieRichards · 2016-10-24T03:27:39Z

code/modules/clothing/neck/ties.dm

+			var/body_part = parse_zone(user.zone_selected)
+			if(body_part)
+				var/their = "their"
+				switch(M.gender)


we have pronoun procs that automatically return things such as "his","her"

I didn't do this, I was copy/pasting shit from the other slots just to be certain on things I was unsure about.

Doesn't matter, you touch code it's your job to update it :P

RemieRichards · 2016-10-24T03:30:04Z

code/modules/clothing/under/ties.dm

@@ -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


Probably worth nuking this path from orbit now, no need for it anymore.

I didn't change armbands, or medals, or the waistcoat.

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" :)

RemieRichards · 2016-10-24T03:32:16Z

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 /neck from the looks of things)

…e to armbands and such instead of just avoiding conflicts.

chowdermcarthor · 2016-10-24T03:38:37Z

I did it for most maps, forgot to do metastation for some reason is all.

ghost · 2016-10-24T03:40:32Z

Chowder is cool.

ghost · 2016-10-24T03:41:17Z

Oh and this looks cool.

GunHog · 2016-10-24T03:44:16Z

Pet collar ❤️

RemieRichards · 2016-10-24T03:45:24Z

@chowdermcarthor One thing to request, mind showing a UI shot?

chowdermcarthor · 2016-10-24T03:46:08Z

It's just some minor Z levels like on away missions and such now, and sure,

Fixing the other Z level stuff now.

RemieRichards · 2016-10-24T03:47:49Z

Fits in nicely

Cheridan · 2016-10-24T04:00:27Z

So uh
what does this do that the previous system doesn't

RemieRichards · 2016-10-24T04:00:57Z

The previous system was shit Cheri.

PKPenguin321 · 2016-10-24T04:01:38Z

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

chowdermcarthor · 2016-10-24T04:02:00Z

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.
Also by that idea, arm bands shouldn't need a jumpsuit, but I didn't add them to neckslots.
And, to be fair, the ties are said in their desc. to be clip-ons, not normal ties, which I forgot to change.

TechnoAlchemisto · 2016-10-24T04:35:53Z

This is fucking sick yo

chowdermcarthor · 2016-10-24T04:47:57Z

https://i.gyazo.com/876e6059af2af40e5664a3ffae776b6e.png
I need to remember tomorrow to go and change some of the descriptions, just noticed this while observing on bagil.

optimumtact · 2016-10-24T07:09:27Z

the tie inventory slot icon looks like a penis

optimumtact · 2016-10-24T07:17:30Z

code/modules/clothing/under/ties.dm

@@ -55,7 +55,7 @@

 /obj/item/clothing/tie/proc/on_uniform_dropped(obj/item/clothing/under/U)
 	return
-
+/*


remove commented out code

Cheridan · 2016-10-24T10:02:13Z

@RemieRichards not an argument

optimumtact · 2016-10-24T10:04:41Z

It's a lot less confusing for new players

Ryll-Ryll · 2016-10-24T11:14:30Z

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

XDTM · 2016-10-24T12:59:37Z

Can't wait for exploding collars

Cheridan · 2016-10-24T13:44:22Z

@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.

AnturK · 2016-10-24T13:57:31Z

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.

X-TheDark · 2016-10-24T16:14:22Z

code/__DEFINES/clothing.dm

@@ -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


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;

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.

PKPenguin321 · 2016-10-24T18:22:06Z

But yeah big 👍 to this, makes coding special neck items much easier

Tacolizard · 2016-10-24T19:31:41Z

finally i can wear a medal and scarf without being weighed down

# Conflicts: # _maps/map_files/PubbyStation/PubbyStation.dmm

RemieRichards · 2016-10-25T05:28:59Z

@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.
cmon now cheri you're better than this.

Iamgoofball · 2016-10-25T06:21:28Z

What if accessories was a mini inventory with 3 slots

Tacolizard · 2016-10-25T14:51:59Z

@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.

…p when searched.

chowdermcarthor · 2016-10-25T23:00:11Z

Gah fuck, didn't mean to upload that to this.
How do I remove a file from a pull request?

GunHog · 2016-10-25T23:02:31Z

Write a commit to revert your most recent change.

PKPenguin321 · 2016-10-26T00:39:45Z

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

Anonmare · 2016-10-26T00:56:24Z

👍
Also, question, will this allow for things like cloaks? Since they do slot around the neck and all.

chowdermcarthor added 3 commits October 23, 2016 19:06

Added in a neckslot. Moved some tie items over to said neckslot.

b1bc2ef

Merge branch 'master' of https://github.com/tgstation/tgstation

f2f637e

Changng some stuff to fix the new neckslot items.

411840c

RemieRichards reviewed Oct 24, 2016

View reviewed changes

chowdermcarthor added 2 commits October 23, 2016 20:33

no message

8286c6c

Altered comment to say that the old tie system is being kept as-is du…

727411e

…e to armbands and such instead of just avoiding conflicts.

no message

c87e902

bs12-bot added the Map Edit label Oct 24, 2016

optimumtact reviewed Oct 24, 2016

View reviewed changes

X-TheDark reviewed Oct 24, 2016

View reviewed changes

Changed the number for this.

d858b50

Merge branch 'master' of https://github.com/tgstation/tgstation

c74a143

# Conflicts: # _maps/map_files/PubbyStation/PubbyStation.dmm

Fixed jaws of life not having a category, thus they only would show u…

a8e90d5

…p when searched.

optimumtact merged commit c7e474c into tgstation:master Oct 26, 2016

tgstation-server added a commit that referenced this pull request Oct 26, 2016

Automatic changelog generation for PR #21169 [ci skip]

8f5de4d

		@@ -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

Neck Slots #21169

Neck Slots #21169

Conversation

chowdermcarthor commented Oct 24, 2016

Cyberboss commented Oct 24, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

RemieRichards Oct 24, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

RemieRichards commented Oct 24, 2016

chowdermcarthor commented Oct 24, 2016

ghost commented Oct 24, 2016

ghost commented Oct 24, 2016

GunHog commented Oct 24, 2016

RemieRichards commented Oct 24, 2016

chowdermcarthor commented Oct 24, 2016 • edited by RemieRichards Loading

RemieRichards commented Oct 24, 2016

Cheridan commented Oct 24, 2016

RemieRichards commented Oct 24, 2016

PKPenguin321 commented Oct 24, 2016

chowdermcarthor commented Oct 24, 2016 • edited Loading

TechnoAlchemisto commented Oct 24, 2016

chowdermcarthor commented Oct 24, 2016 • edited Loading

optimumtact commented Oct 24, 2016

Choose a reason for hiding this comment

Cheridan commented Oct 24, 2016

optimumtact commented Oct 24, 2016

Ryll-Ryll commented Oct 24, 2016

XDTM commented Oct 24, 2016

Cheridan commented Oct 24, 2016

AnturK commented Oct 24, 2016

X-TheDark Oct 24, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

PKPenguin321 commented Oct 24, 2016

Tacolizard commented Oct 24, 2016

RemieRichards commented Oct 25, 2016

Iamgoofball commented Oct 25, 2016

Tacolizard commented Oct 25, 2016

chowdermcarthor commented Oct 25, 2016 • edited Loading

GunHog commented Oct 25, 2016

PKPenguin321 commented Oct 26, 2016 • edited Loading

Anonmare commented Oct 26, 2016

RemieRichards Oct 24, 2016 •

edited

Loading

chowdermcarthor commented Oct 24, 2016 •

edited by RemieRichards

Loading

chowdermcarthor commented Oct 24, 2016 •

edited

Loading

chowdermcarthor commented Oct 24, 2016 •

edited

Loading

X-TheDark Oct 24, 2016 •

edited

Loading

chowdermcarthor commented Oct 25, 2016 •

edited

Loading

PKPenguin321 commented Oct 26, 2016 •

edited

Loading