mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 19:52:40 +00:00
Merge pull request #3214 from Anewbe/fbp_limb_tweak
Robolimbs last longer without negative effects
This commit is contained in:
@@ -1127,7 +1127,7 @@ Note that amputating the affected organ does in fact remove the infection from t
|
|||||||
return !(status & (ORGAN_MUTATED|ORGAN_DEAD))
|
return !(status & (ORGAN_MUTATED|ORGAN_DEAD))
|
||||||
|
|
||||||
/obj/item/organ/external/proc/is_malfunctioning()
|
/obj/item/organ/external/proc/is_malfunctioning()
|
||||||
return ((robotic >= ORGAN_ROBOT) && (brute_dam + burn_dam) >= 10 && prob(brute_dam + burn_dam))
|
return ((robotic >= ORGAN_ROBOT) && (brute_dam + burn_dam) >= 25 && prob(brute_dam + burn_dam))
|
||||||
|
|
||||||
/obj/item/organ/external/proc/embed(var/obj/item/weapon/W, var/silent = 0)
|
/obj/item/organ/external/proc/embed(var/obj/item/weapon/W, var/silent = 0)
|
||||||
if(!owner || loc != owner)
|
if(!owner || loc != owner)
|
||||||
|
|||||||
36
html/changelogs/Anewbe - Robolimbs.yml
Normal file
36
html/changelogs/Anewbe - Robolimbs.yml
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
################################
|
||||||
|
# Example Changelog File
|
||||||
|
#
|
||||||
|
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
|
||||||
|
#
|
||||||
|
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
|
||||||
|
# When it is, any changes listed below will disappear.
|
||||||
|
#
|
||||||
|
# Valid Prefixes:
|
||||||
|
# bugfix
|
||||||
|
# wip (For works in progress)
|
||||||
|
# tweak
|
||||||
|
# soundadd
|
||||||
|
# sounddel
|
||||||
|
# rscadd (general adding of nice things)
|
||||||
|
# rscdel (general deleting of nice things)
|
||||||
|
# imageadd
|
||||||
|
# imagedel
|
||||||
|
# maptweak
|
||||||
|
# spellcheck (typo fixes)
|
||||||
|
# experiment
|
||||||
|
#################################
|
||||||
|
|
||||||
|
# Your name.
|
||||||
|
author: Anewbe
|
||||||
|
|
||||||
|
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||||
|
delete-after: True
|
||||||
|
|
||||||
|
# Any changes you've made. See valid prefix list above.
|
||||||
|
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||||
|
# SCREW THIS UP AND IT WON'T WORK.
|
||||||
|
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
|
||||||
|
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
|
||||||
|
changes:
|
||||||
|
- tweak: "Robolimbs can take a bit more damage before they start malfunctioning."
|
||||||
Reference in New Issue
Block a user