Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

you can't implant yourself with a motion detector anymore #3767

Merged
merged 1 commit into from
Jun 30, 2023
Merged

you can't implant yourself with a motion detector anymore #3767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions code/__DEFINES/traits.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,9 @@
//ie. naming a regulation tape "example" will become regulation tape (example)
#define TRAIT_ITEM_RENAME_SPECIAL "t_item_rename_special"

// This item can't be implanted into someone, regardless of the size of the item.
#define TRAIT_ITEM_NOT_IMPLANTABLE "t_item_not_implantable"

//-- structure traits --
// TABLE TRAITS
/// If the table is being flipped, prevent any changes that will mess with adjacency handling
Expand Down
3 changes: 2 additions & 1 deletion code/game/objects/items/devices/motion_detector.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
item_state = "motion_detector"
flags_atom = FPRINT| CONDUCT
flags_equip_slot = SLOT_WAIST
inherent_traits = list(TRAIT_ITEM_NOT_IMPLANTABLE)
var/list/blip_pool = list()
var/detector_range = 14
var/detector_mode = MOTION_DETECTOR_LONG
Expand Down Expand Up @@ -309,7 +310,7 @@
name = "hacked motion detector"
desc = "A device that usually picks up non-USCM signals, but this one's been hacked to detect all non-freelancer movement instead. Fight fire with fire!"
iff_signal = FACTION_MERCENARY

/obj/item/device/motiondetector/hacked/pmc
name = "corporate motion detector"
desc = "A device that usually picks up non-USCM signals, but this one's been reprogrammed to detect all non-PMC movement instead. Very corporate."
Expand Down
2 changes: 2 additions & 0 deletions code/modules/surgery/implant.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@
if(.)
if(is_surgery_tool(tool)) //Make sure you still have all your tools after a surgery.
return FALSE
if(HAS_TRAIT(tool, TRAIT_ITEM_NOT_IMPLANTABLE))
return FALSE
if(tool.w_class > get_max_wclass(surgery))
to_chat(user, SPAN_WARNING("[tool] is too big to implant into [surgery.target]'s [surgery.affected_limb.cavity]!"))
return FALSE
Expand Down
Loading