Skip to content

Commit

Permalink
woops
Browse files Browse the repository at this point in the history
  • Loading branch information
kiVts committed Aug 24, 2024
1 parent d1b04d4 commit 36befc5
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
4 changes: 4 additions & 0 deletions code/game/objects/items/devices/data_detector.dm
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@
for(var/obj/I in M.contents_twice())
for(var/DT in objects_to_detect)
if(istype(I, DT))
if(istype(I, /obj/item/storage/fancy/vials/random) && !length(I.contents))
break
if(istype(I, /obj/item/reagent_container/glass/beaker/vial/random) && !I.reagents?.total_volume)
break
detected = TRUE

if(human_user && detected)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/paperwork/paper.dm
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,7 @@
txt += "Dear valued Research department aboard [MAIN_SHIP_NAME], We believe [MAIN_SHIP_NAME] is above Weyland-Yutani Sponsored colony, thus we decided to share colony research findings. <BR>\n\n"
txt += "During testing, the theorized component [PROPERTY_CIPHERING] was found to be made of [hint[1]], Recent discovery made us believe the one of the missing pieces has [isNeutralProperty(hint[3]) ? "neutral" : "negative"] effects.<BR>\n"
txt += "<BR>\n<HR> - <I>Weyland-Yutani</I>"
if("ciph_hint_complete")
if("ciph_hint_complete") //todo, rewrite this, same for ^^^
icon_state = "paper_wy_words"
name = "Research Opportunity"
txt += "Weyland-Yutani Biological Weapons Division</H2></center>"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@
P.trigger()
else
return

GLOB.chemical_data.complete_chemical(S)
else
var/datum/asset/asset = get_asset_datum(/datum/asset/simple/paper)
Expand Down
9 changes: 3 additions & 6 deletions code/modules/surgery/surgery_initiator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

/proc/initiate_surgery_moment(obj/item/tool, mob/living/carbon/target, obj/limb/affecting, mob/living/user)
if(!tool && !(affecting.status & LIMB_UNCALIBRATED_PROSTHETIC))
to_chat(user, SPAN_WARNING("You can't perform surgery here!"))
return FALSE
var/target_zone = user.zone_selected
var/list/available_surgeries = list()
Expand All @@ -20,14 +19,11 @@
if(!istype(T) || !T.supports_surgery)
if(tool.flags_item & CAN_DIG_SHRAPNEL) //Both shrapnel removal and prosthetic repair shouldn't be affected by being on the dropship.
tool.dig_out_shrapnel_check(target, user)
to_chat(user, SPAN_WARNING("You can't perform surgery here!"))
return TRUE //Otherwise you get 'poked' by the knife.
if(HAS_TRAIT(tool, TRAIT_TOOL_BLOWTORCH) && affecting)
to_chat(user, SPAN_WARNING("You can't perform surgery here!"))
return FALSE
if(!(tool.type in SURGERY_TOOLS_NO_INIT_MSG))
to_chat(user, SPAN_WARNING("You can't perform surgery under these bad conditions!"))
to_chat(user, SPAN_WARNING("You can't perform surgery here!"))
return FALSE

var/obj/limb/surgery_limb = target.get_limb(target_zone)
Expand All @@ -38,13 +34,11 @@
return

if(user.action_busy) //already doing an action
to_chat(user, SPAN_WARNING("You can't perform surgery here!"))
return FALSE

for(var/datum/surgery/surgeryloop as anything in GLOB.surgeries_by_zone_and_depth[target_zone][target.incision_depths[target_zone]])
//Skill check.
if((target.mob_flags & EASY_SURGERY) ? !skillcheck(user, SKILL_SURGERY, SKILL_SURGERY_NOVICE) : !skillcheck(user, SKILL_SURGERY, surgeryloop.required_surgery_skill))
to_chat(user, SPAN_WARNING("You can't perform surgery here!"))
continue

//Lying and self-surgery checks.
Expand All @@ -53,14 +47,17 @@

if(!surgeryloop.self_operable && target == user)
continue

//Species check.
if(!is_type_in_typecache(target, GLOB.surgical_patient_types["[surgeryloop]"]))
continue

//Limb checks.
if(affecting)
if(surgeryloop.requires_bodypart)
if(affecting.status & LIMB_DESTROYED)
continue

else
if(ishuman(target))//otherwise breaks when trying to op xeno
if(!(affecting.status & LIMB_DESTROYED) && ishuman(target))
Expand Down

0 comments on commit 36befc5

Please sign in to comment.