cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-27 14:46:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
BongaTheProto
2023-07-25 22:47:02 -05:00
parent ca38ad5e3b 7e51ef0b98
commit e87e828638
20 changed files with 539 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/dna_injector.dm
+16
View File
@@ -16,6 +16,16 @@
var/used = 0
/obj/item/dnainjector/Initialize(mapload)
. = ..()
register_item_context()
/obj/item/dnainjector/add_item_context(obj/item/source, list/context, mob/living/target, mob/living/user)
. = ..()
if(isliving(target) && target.has_dna() && !used)
LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_ANY, "Inject")
return CONTEXTUAL_SCREENTIP_SET
/obj/item/dnainjector/attack_paw(mob/user)
return attack_hand(user)
@@ -525,6 +535,12 @@
var/filled = FALSE
var/crispr_charge = FALSE // Look for viruses, look at symptoms, if research and Dormant DNA Activator or Viral Evolutionary Acceleration, set to true
/obj/item/dnainjector/activator/add_item_context(obj/item/source, list/context, atom/target, mob/living/user)
. = ..()
if(istype(target, /obj/machinery/computer/scan_consolenew) && used)
LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_ANY, "Recycle")
return CONTEXTUAL_SCREENTIP_SET
/obj/item/dnainjector/activator/inject(mob/living/carbon/M, mob/user)
if(M.has_dna() && !HAS_TRAIT_NOT_FROM(M, TRAIT_RADIMMUNE,BLOODSUCKER_TRAIT) && !HAS_TRAIT(M,TRAIT_NOCLONE))
M.radiation += rand(20/(damage_coeff ** 2),50/(damage_coeff ** 2))
code/game/objects/structures/bedsheet_bin.dm
+7
View File
@@ -65,6 +65,13 @@ GLOBAL_LIST_INIT(double_bedsheets, list(/obj/item/bedsheet/double,
if(bedsheet_type == BEDSHEET_DOUBLE)
stack_amount *= 2
dying_key = DYE_REGISTRY_DOUBLE_BEDSHEET
register_item_context()
/obj/item/bedsheet/add_item_context(obj/item/source, list/context, atom/target, mob/living/user)
. = ..()
if(iscarbon(target))
LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_ANY, "Prepare Surgery")
return CONTEXTUAL_SCREENTIP_SET
/obj/item/bedsheet/attack(mob/living/M, mob/user)
if(!attempt_initiate_surgery(src, M, user))