From ed94240dcce4852bba51691899f5645f0add4e28 Mon Sep 17 00:00:00 2001 From: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> Date: Wed, 16 Oct 2024 17:07:04 +0200 Subject: [PATCH 1/2] Added a robotic syringe --- .../mob/living/silicon/robot/robot_modules.dm | 2 +- .../reagents/reagent_containers/syringes.dm | 19 +++++- .../changelogs/fluffyghost-roboticsyringe.yml | 58 +++++++++++++++++++ 3 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/fluffyghost-roboticsyringe.yml diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 95af74f4c5b..713066d75fc 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -230,7 +230,7 @@ var/global/list/robot_modules = list( modules += new /obj/item/gripper/chemistry(src) modules += new /obj/item/reagent_containers/dropper/cyborg_pipette(src) modules += new /obj/item/roller_holder(src) - modules += new /obj/item/reagent_containers/syringe(src) + modules += new /obj/item/reagent_containers/syringe/robotic(src) modules += new /obj/item/device/reagent_scanner/adv(src) modules += new /obj/item/device/mass_spectrometer(src) modules += new /obj/item/autopsy_scanner(src) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 9726dded209..e9ede8229e1 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -39,6 +39,9 @@ drop_sound = 'sound/items/drop/glass_small.ogg' pickup_sound = 'sound/items/pickup/glass_small.ogg' + ///Boolean, if this syringe gets dirty (and consequently infects people when reused) + var/gets_dirty = TRUE + /obj/item/reagent_containers/syringe/Initialize() . = ..() update_icon() @@ -73,7 +76,7 @@ log_and_message_admins("[loc] infected [target]'s [eo.name] with \the [src].") addtimer(CALLBACK(src, PROC_REF(infect_limb), eo), rand(5 MINUTES, 10 MINUTES)) - if(!used) + if(!used && gets_dirty) START_PROCESSING(SSprocessing, src) used = TRUE @@ -381,6 +384,20 @@ /// Syringes. END //////////////////////////////////////////////////////////////////////////////// +/*############# + SUBTYPES +#############*/ + +/** + * #Robotic syringe + * + * This syringe is for borgs and the likes, do not give it around otherwise + */ +/obj/item/reagent_containers/syringe/robotic + name = "robotic syringe" + desc = "A syringe for our syntetic friends." + gets_dirty = FALSE + /obj/item/reagent_containers/syringe/inaprovaline name = "Syringe (inaprovaline)" desc = "Contains inaprovaline - used to stabilize patients." diff --git a/html/changelogs/fluffyghost-roboticsyringe.yml b/html/changelogs/fluffyghost-roboticsyringe.yml new file mode 100644 index 00000000000..6c16e51a013 --- /dev/null +++ b/html/changelogs/fluffyghost-roboticsyringe.yml @@ -0,0 +1,58 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: FluffyGhost + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a robotic syringe, to be used by borgs, that do not get dirty and gives infection to people after the first use." From a72fad01e6fb89ef178a5ee816a888bd546fc35f Mon Sep 17 00:00:00 2001 From: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> Date: Fri, 18 Oct 2024 05:40:42 +0200 Subject: [PATCH 2/2] Update code/modules/reagents/reagent_containers/syringes.dm Co-authored-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com> Signed-off-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> --- code/modules/reagents/reagent_containers/syringes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index e9ede8229e1..8c226fed0f8 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -395,7 +395,7 @@ */ /obj/item/reagent_containers/syringe/robotic name = "robotic syringe" - desc = "A syringe for our syntetic friends." + desc = "A syringe for our synthetic friends." gets_dirty = FALSE /obj/item/reagent_containers/syringe/inaprovaline