Ports Slapping and Kissing #15539
Merged
Ports Slapping and Kissing #15539
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fox-McCloud
commented
Feb 16, 2021
code/game/objects/items/hand_item.dm
Outdated
| name = "slapper" | ||
| desc = "This is how real men fight." | ||
| icon_state = "latexballon" | ||
| item_state = "" |
There was a problem hiding this comment.
this has to be this way; if it's null, it'll inherit the icon_state as the default item_state
|
New ways to taunt prisoners as seccie, dope! |
dearmochi
approved these changes
Feb 19, 2021
That's intentional; nothing can be put in your hands, since, technically, you're technically handcuffed. |
Mhm, I meant more like the |
Fun. This means inventory code is handling something improperly--it's resulting in the object being dropped, apparently, but it doesn't check for if you can even hold something first then. Joy. |
Dumbdumn5
approved these changes
Mar 2, 2021
|
Merge conflicts resolved. I went ahead and implemented table slapping too. |
| color = COLOR_BLACK | ||
| kiss_type = /obj/item/projectile/kiss/death | ||
|
|
||
| /obj/item/projectile/kiss |
There was a problem hiding this comment.
Well thats something you dont read every day
AffectedArc07
approved these changes
Mar 14, 2021
Evankhell561
pushed a commit
to Helixis/Paradise
that referenced
this pull request
Mar 14, 2021
* fixes tile atmos overlays going invisible * Attempts to fix CI dependency failures (ParadiseSS13#15709) * Attempts to fix CI dependency failures * Lets try this * And this * And this * Fixes an exploit with boxing gloves and other martial arts (ParadiseSS13#15711) * Fixes being unable to make a disk compartmentalizer (ParadiseSS13#15696) * Adds more magic items and spells to the wizard spellbook (ParadiseSS13#15036) * touches more or less everthing that is magic * Other changes I forgot to put in * removes extra s * nevermind lets not do drake form * Apply suggestions from code review Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> * Better variable name * Heart curse removed * Re adds new stuff Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> * Combines some admin verbs together (ParadiseSS13#15159) * Admin Jumping * GLOB.clients * Review suggestions Co-authored-by: Farie82 <farie82@users.noreply.github.com> * Blackbox comments * Not sure why it wasn't a proc in the first place to be honest... Co-authored-by: Farie82 <farie82@users.noreply.github.com> * Nerfs drake form. (ParadiseSS13#15235) * Shaking the dead now gives a message indicating the person is dead (ParadiseSS13#15512) * Shaking the dead now gives a message indicating the person is dead * Update carbon.dm * Update carbon.dm * Revert "Revert "Revert "Update carbon.dm""" This reverts commit 5e5da7bb6ddba56872a05b0e5c6aaa2c835c1e94. * Fixing, and adding a check for self waking Overhaul based on Faries points * Prevents the look of Krav maga from being changed in a washing machine (ParadiseSS13#15522) * Prevents the look of Krav maga from being changed in a washing machine * Apply suggestions from code review Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> * Ports Slapping and Kissing (ParadiseSS13#15539) * Ports Slapping and Kissing * forgot this * table slapping * Fixes the top left pixels on vending machines (ParadiseSS13#15550) @LightFire53 did some fixes to the top left pixels on the vending machines. Before the fix, they had two gray pixels which would clash with the general sprite (very out of place). Pics will be posted below. This fix was added to the following sprites inside vending.dmi: + Snack Vendor (snack) + Soviet Soda Vendor (sovietsoda) + Nutrimat (nutrimat) + Nutrient Vendor (nutri) + Robotics Vendor (robotics) + Generic Vendor (generic) + Engineering Vendor (engivend) + Cigarettes Vendor (cigs) + Magic Vendor (MagiVend) + Cola Machine Vendor (Cola_Machine) + Engineer Vendor (engi) * oops I broke the repo (ParadiseSS13#15715) * Adds a cancel combo button for krav maga (ParadiseSS13#15543) * pew pew * uhhh yes * tumblr moment Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> * Fixes HUD sunglasses deconstruction (ParadiseSS13#15444) * sunglasses * Unit test test * Unit test test tested * vamosvamosvamos Co-authored-by: mafemergency <mafemergency@gmail.com> Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Co-authored-by: Farie82 <farie82@users.noreply.github.com> Co-authored-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Co-authored-by: Fox McCloud <Fox-McCloud@users.noreply.github.com> Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> Co-authored-by: hal9000PR <69320440+hal9000PR@users.noreply.github.com> Co-authored-by: Kepplerx <65926304+Kepplerx@users.noreply.github.com> Co-authored-by: Johnathan Pewtershmitz <xengan@gmail.com>
Kiyahitayika
pushed a commit
to Kiyahitayika/Paradise
that referenced
this pull request
Apr 12, 2021
* Ports Slapping and Kissing * forgot this * table slapping
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ports TG's method of slapping and adds kiss blowing.
Instead of slapping being a mere emote that has text with it, or you have to input someone's name, precisely (with some weird names being oddly immune to input parameters), this transitions them to an object that gets put in your hand.
This generally makes things a bit more interact as you have to actually click on the person instead of just running the emote and that's that.
This also implements TG's kiss blowing emote.
When you use the emote you get a little heart icon in your hand; wherever you click next, the kiss will travel across the screen until it hits someone or hits a way.
Kisses deal no damage (though, if/when quirks are in, anxious people won't know how to react to them) and just have unique sound.
If you have the trait
KISS_OF_DEATHthen your kisses will uh....be a lot more deadly---you'll be a heartbreaker, quite literally; not only do they deal damage, but they straight up deal massive damage to someone's heart; enough to instantly kill it. I was going to add the lipstick of death, but it'll cause a lot of conflict with the mutations refactor, so I'll wait on that once this and the other are merged in.Provides players with an additional little harmless interaction while also making an existing one a bit more interactive and immersive.
馃啈 Fox McCloud
tweak: Slapping now gives you a slapping hand that you actually can click on someone with; slapping has a new sound too!
tweak: You can also slap a table with the slapping hand; regular intent allows you to do up to 3 rapid slaps that are quieter, or you can switch to harm intent and do one really big table slap that's louder
add: Adds in kiss blowing; use the kiss emote to activate it, then click where you want to blow the kiss to
/:cl: