mirror of
https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git
synced 2026-08-25 08:17:00 +01:00
A couple more fixes (#7302)
<!-- 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 - You can now deactive a life crystal by using it in your hand. This is permanent (it breaks it), since not being able to reuse them seems to be intentional according to a code comment. - Ghosts can no longer interact with the coffeemaker. - Blood splatters from bleeding now correctly use a species' blood color (or custom blood color for custom species). ## Why It's Good For The Game The life crystal one is arguably very QOL for people who use them but want to take off their uniforms for whatever reason. Blood color is also a nice touch for people who use custom blood colors for their species (or really, for any species that doesn't use the usual blood color). The other is a simple bugfix. ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> 🆑 add: You can now deactivate a life crystal by using it in your hand. fix: Ghosts can no longer brew coffee. fix: Bleeding now respects a species' blood color (including custom blood color). /🆑 <!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 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. -->
This commit is contained in:
@@ -154,7 +154,7 @@
|
||||
if(!total)
|
||||
return null
|
||||
amount = min(amount, total)
|
||||
if(amount <= 0) return null
|
||||
if(amount < 0) return null
|
||||
var/multiplier = max(0, 1 - (amount / total))
|
||||
|
||||
var/datum/blood_mixture/creating = new
|
||||
|
||||
@@ -279,6 +279,8 @@
|
||||
/obj/machinery/coffeemaker/ui_interact(mob/user) // The microwave Menu //I am reasonably certain that this is not a microwave //I am positively certain that this is not a microwave
|
||||
. = ..()
|
||||
|
||||
if(!can_interact(user) || !user.canUseTopic(src, !issilicon(user)))
|
||||
return FALSE
|
||||
if(brewing)
|
||||
return
|
||||
|
||||
|
||||
Reference in New Issue
Block a user