Skip to content

Commit

Permalink
Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Lexanx committed Jul 31, 2024
1 parent 00e1dfe commit fb1de56
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 22 deletions.
2 changes: 1 addition & 1 deletion code/game/antagonist/antagonist.dm
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
var/datum/language/required_language = null

// Used for setting appearance.
var/list/valid_species = list(SPECIES_UNATHI,SPECIES_SKRELL,SPECIES_HUMAN,SPECIES_VOX)
var/list/valid_species = list(SPECIES_UNATHI,SPECIES_SKRELL,SPECIES_HUMAN,SPECIES_VOX,SPECIES_DIONA,SPECIES_IPC)
var/min_player_age = 14

// Runtime vars.
Expand Down
10 changes: 10 additions & 0 deletions code/game/atoms.dm
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,16 @@
return A.loc
A = A.loc



/atom/proc/drop_location()
var/atom/L = loc
if(!L)
return null
return L.AllowDrop() ? L : L.drop_location()



/**
* Called when a user examines the atom. This proc and its overrides handle displaying the text that appears in chat
* during examines.
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/robotics_fabricator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -338,8 +338,8 @@
for(var/obj/machinery/computer/rdconsole/RDC in get_area_all_atoms(get_area(src)))
if(!RDC.sync)
continue
files.download_from(RDC.files)
//[SIERRA-EDIT] - MODPACK_RND
files = RDC.files
sync_message = "Sync complete."
update_categories()
//[/SIERRA-EDIT] - MODPACK_RND
2 changes: 1 addition & 1 deletion code/modules/research/rdconsole.dm
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
search_text = ""
if(href_list["eject_disk"]) // User is ejecting the disk.
if(disk)
disk.forceMove(src.loc)
disk.forceMove(drop_location())
disk = null
if(href_list["delete_disk_file"]) // User is attempting to delete a file from the loaded disk.
if(disk)
Expand Down
13 changes: 7 additions & 6 deletions code/modules/surgery/robotics.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

/singleton/surgery_step/robotics/success_chance(mob/living/user, mob/living/carbon/human/target, obj/item/tool)
. = ..()
if(!user.skill_check(SKILL_DEVICES, SKILL_TRAINED))
if(!user.skill_check(SKILL_DEVICES, SKILL_BASIC))
. -= 30
if(!user.skill_check(SKILL_DEVICES, SKILL_EXPERIENCED))
if(!user.skill_check(SKILL_DEVICES, SKILL_TRAINED))
. -= 20
if(user.skill_check(SKILL_DEVICES, SKILL_EXPERIENCED))
. += 35
Expand Down Expand Up @@ -398,10 +398,11 @@
for(var/obj/item/organ/I in affected.internal_organs)
if(I && I.damage > 0)
if(BP_IS_ROBOTIC(I))
user.visible_message("[user] starts mending the damage to [target]'s [I.name]'s mechanisms.", \
"You start mending the damage to [target]'s [I.name]'s mechanisms." )
playsound(target.loc, 'sound/items/bonegel.ogg', 50, TRUE)
..()
if(!((I.organ_tag == BP_BRAIN) && (I.status == ORGAN_DEAD)))
user.visible_message("[user] starts mending the damage to [target]'s [I.name]'s mechanisms.", \
"You start mending the damage to [target]'s [I.name]'s mechanisms." )
playsound(target.loc, 'sound/items/bonegel.ogg', 50, TRUE)
..()

/singleton/surgery_step/robotics/fix_organ_robotic/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
Expand Down
30 changes: 17 additions & 13 deletions mods/ipc_mods/code/ipc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,23 @@
// Ремонт позитронного мозга
/obj/item/organ/internal/posibrain/use_tool(obj/item/stack/nanopaste, mob/living/user, list/click_params)
. = ..()
if(src.damage > src.max_damage)
to_chat(user, SPAN_WARNING("[src] is completely ruined."))
return
if(src.damage > 0)
if(do_after(user, 40, src))
src.damage -= (30)
if(src.damage < 0)
src.damage = 0
nanopaste.use(1)
user.visible_message(SPAN_NOTICE("\The [user] applied some nanopaste on [src]'s damaged areas."),\
SPAN_NOTICE("You apply some nanopaste at [src]'s damaged areas."))
else
to_chat(user, SPAN_NOTICE("All [src]'s systems are nominal."))
if(istype(nanopaste, /obj/item/stack/nanopaste))
if(user.skill_check(SKILL_DEVICES, SKILL_TRAINED))
if(src.damage >= src.max_damage)
to_chat(user, SPAN_WARNING("[src] is completely ruined."))
return
if(src.damage > 0)
if(do_after(user, 40, src))
src.damage -= (30)
if(src.damage < 0)
src.damage = 0
nanopaste.use(1)
user.visible_message(SPAN_NOTICE("\The [user] applied some nanopaste on [src]'s damaged areas."),\
SPAN_NOTICE("You apply some nanopaste at [src]'s damaged areas."))
else
to_chat(user, SPAN_NOTICE("All [src]'s systems are nominal."))
else
to_chat(user, SPAN_WARNING("You have no idea how to do that!"))

/obj/item/organ/internal/posibrain/ipc
name = "Positronic brain"
Expand Down

0 comments on commit fb1de56

Please sign in to comment.