Skip to content

Commit

Permalink
Adds co-op cigarette lighting (#2686)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

If you have a cigarette equipped, and someone else has an un-lit
cigarette equipped, you can light theirs via help intent+target mouth


![image](https://github.com/shiptest-ss13/Shiptest/assets/24857008/c1a352a4-5ae5-41e3-91c7-37780cbb8535)

## Why It's Good For The Game

New co-op interaction

## Changelog

:cl:
add: If you are smoking a cigarette, you can light someone else's
cigarette via help intent while targeting the mouth
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
SomeguyManperson authored Feb 2, 2024
1 parent 9d329c9 commit 7ef9bda
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions code/modules/mob/living/carbon/carbon_defense.dm
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,14 @@
if(M == src && check_self_for_injuries())
return

if(M.zone_selected == BODY_ZONE_PRECISE_MOUTH)
var/obj/item/clothing/mask/cigarette/theircig = wear_mask
var/obj/item/clothing/mask/cigarette/ourcig = M.wear_mask
if(istype(ourcig) && istype(theircig))
if(ourcig.lit && !theircig.lit)
theircig.light(span_notice("[M] leans towards [src], lighting [p_their()] [theircig.name] with [M.p_their()] own."))
return

if(body_position == LYING_DOWN)
if(buckled)
to_chat(M, "<span class='warning'>You need to unbuckle [src] first to do that!</span>")
Expand Down

0 comments on commit 7ef9bda

Please sign in to comment.