Join GitHub today
GitHub is home to over 36 million developers working together to host and review code, manage projects, and build software together.
Sign upAdds vibrator #7683
Conversation
KA101
added some commits
May 18, 2014
This comment has been minimized.
This comment has been minimized.
|
In before flamewar. On a more serious note, I'm on board with this PR. Seems like a good clean counterpart to all the drugs and booze for downtime morale boosting activities. |
This comment has been minimized.
This comment has been minimized.
|
This only work on women? Otherwise it's disgusting! |
This comment has been minimized.
This comment has been minimized.
|
You decide. The description leaves it up to your imagination. |
This comment has been minimized.
This comment has been minimized.
|
Aw ye. |
kevingranade
reviewed
May 19, 2014
| @@ -8,7 +8,7 @@ | |||
|
|
|||
| enum activity_type { | |||
| ACT_NULL = 0, | |||
| ACT_RELOAD, ACT_READ, ACT_GAME, ACT_WAIT, ACT_CRAFT, ACT_LONGCRAFT, | |||
| ACT_RELOAD, ACT_READ, ACT_GAME, ACT_VIBE, ACT_WAIT, ACT_CRAFT, ACT_LONGCRAFT, | |||
This comment has been minimized.
This comment has been minimized.
kevingranade
May 19, 2014
Member
Need to add an id string for each activity to support stable saving/loading, until then we need to append to the activity_type list to avoid making people's activity change when loading an old save. This for example would have turned wait into vibe...
This comment has been minimized.
This comment has been minimized.
KA101
May 19, 2014
Author
Contributor
Thanks. Was afraid I'd have some sort of sequence problem so tried to match to where things were in the list. (So I had the Other sequence problem instead. Gagh.) Will fix.
This comment has been minimized.
This comment has been minimized.
tyrael93
commented
May 19, 2014
|
why |
This comment has been minimized.
This comment has been minimized.
|
Why would you even? I mean, please no. Can you just make it a personal mod post it in the forums and call it a day? Please do that instead I am begging you. |
This comment has been minimized.
This comment has been minimized.
tyrael93
commented
May 19, 2014
|
DDA: magic and vibrators I just wanted to use a fucking different viewport for the original cata |
This comment has been minimized.
This comment has been minimized.
|
I had thought about something like this before, but came to the conclusion that we're not making a porn roguelike (though those do exist, oddly enough). I'd honestly rather not see this in mainline Cataclysm. Only my opinion, though. |
This comment has been minimized.
This comment has been minimized.
|
Go back and re-read the (incredibly vague) text strings. It's only pornographic if you want it to be. It could just as easily be a neck massager, the way it's described. The name might be a bit loaded. Perhaps something like 'personal massager' would be better? |
This comment has been minimized.
This comment has been minimized.
|
Ah, that looks fine, then. Objection withdrawn. |
This comment has been minimized.
This comment has been minimized.
|
I suppose a change of name to "personal massager" due to the implications of "vibrator" for most people |
This comment has been minimized.
This comment has been minimized.
|
Personal massager sounds better. |
This comment has been minimized.
This comment has been minimized.
If you also change the strings and description to imply that what you are using is actually a neck massager I have no qualms whatsoever. I mean do we really want DDA to be the kind of game in which you masturbate mid-battle to gain combat bonuses? And it is apparently a serious question. |
This comment has been minimized.
This comment has been minimized.
|
Mid-battle is not an option, any more than reading a book would be. |
This comment has been minimized.
This comment has been minimized.
|
Even if the wordings are ambiguous, I guarantee that the majority of people will see it as a sex toy. Even typing just 'vibrator' into Google will give you search results for vibrator sex toys. I oppose the addition of the item as-is due to the majority association of a vibrator as a sex toy and the societal taboo of depicting sexual acts in video games (by association with the first point). Were this item named 'personal massager' instead, there would be no concerns of players associating a vibrator item as the sex toy of the same name. |
This comment has been minimized.
This comment has been minimized.
|
Right, a "personal massager". Googling "personal massager" also brings up sex toys. |
This comment has been minimized.
This comment has been minimized.
|
Maybe just "massager" then |
This comment has been minimized.
This comment has been minimized.
|
I have no respect for 'societal taboos', you're going to need a better |
This comment has been minimized.
This comment has been minimized.
|
No one has made a credible argument against, so it is one-sided I guess, |
This comment has been minimized.
This comment has been minimized.
|
I'm 99.999% with you Kevin. |
This comment has been minimized.
This comment has been minimized.
|
Sigh |
This comment has been minimized.
This comment has been minimized.
|
Eh, don't see why not, maybe a bigger moral boost if you have the bad back trait? |
This comment has been minimized.
This comment has been minimized.
|
It's already a pretty big morale boost; any other thoughts? |
This comment has been minimized.
This comment has been minimized.
|
Is this ready to be merged? |
kevingranade
merged commit 7c0bb73
into
CleverRaven:master
May 21, 2014
1 check passed
This comment has been minimized.
This comment has been minimized.
|
@Senrain : I like the bad back idea. |
This comment has been minimized.
This comment has been minimized.
moist-zombie
commented
May 21, 2014
|
Now just lemme at those scented candles (seriously, scented candles isn't the worst idea, haha.. Anything that smells better than putrefying flesh is sure to make you happier).. Hit the liquor store for a nice bottle of wine and I'll be ready to unwind in style ;) |
KA101 commentedMay 18, 2014
Inspired by CreamyGoodness mistaking the mp3 player's morale boost for something high-powered.
How you work your tension out is left up to the player, but it's a very good battery-morale conversion. (It's inferior to Marloss Bliss, if you're curious what I was using as a comparison.)
Adds fatigue on a 1:1 basis with morale, though, so you can't buzz around constantly. (I don't think they're loud enough to merit attaching a sound, and user noise is likewise left to the player's imagination.)