Renames all typepaths + names of implants to biochips (#23172)

* The fix

* Contraaaaaa

* Fixes CI

* Fixes the pads + cases

* Uplink datums

* Update code/datums/mind.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/__HELPERS/unsorted.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/research/designs/medical_designs.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/research/designs/medical_designs.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/research/designs/medical_designs.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/research/designs/medical_designs.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/surgery/implant_removal.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Outfits now use a proper variable name

* Fixes surgery (oops)

* More .dme changes

* Renames the folder

* Fixes bad merge

* Contra review

* Update code/game/objects/items/weapons/dice.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Fixes CI fail

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
This commit is contained in:
DGamerL
2024-01-07 00:15:55 +01:00
committed by GitHub
parent fad6509b5e
commit 382a71df0d
94 changed files with 674 additions and 675 deletions
+1 -1
View File
@@ -53,7 +53,7 @@
affected_mob.overlays.Cut()
affected_mob.invisibility = 101
for(var/obj/item/W in affected_mob)
if(istype(W, /obj/item/implant))
if(istype(W, /obj/item/bio_chip))
qdel(W)
continue
W.layer = initial(W.layer)
+4 -4
View File
@@ -802,14 +802,14 @@
switch(href_list["implant"])
if("remove")
for(var/obj/item/implant/mindshield/I in H.contents)
for(var/obj/item/bio_chip/mindshield/I in H.contents)
if(I && I.implanted)
qdel(I)
to_chat(H, "<span class='notice'><Font size =3><B>Your mindshield bio-chip has been deactivated.</B></FONT></span>")
to_chat(H, "<span class='notice'><font size='3'><b>Your mindshield bio-chip has been deactivated.</b></font></span>")
log_admin("[key_name(usr)] has deactivated [key_name(current)]'s mindshield bio-chip")
message_admins("[key_name_admin(usr)] has deactivated [key_name_admin(current)]'s mindshield bio-chip")
if("add")
var/obj/item/implant/mindshield/L = new/obj/item/implant/mindshield(H)
var/obj/item/bio_chip/mindshield/L = new/obj/item/bio_chip/mindshield(H)
L.implant(H)
log_admin("[key_name(usr)] has given [key_name(current)] a mindshield bio-chip")
@@ -1407,7 +1407,7 @@
if(has_antag_datum(/datum/antagonist/mindslave, FALSE))
var/mob/living/carbon/human/H = current
for(var/i in H.contents)
if(istype(i, /obj/item/implant/traitor))
if(istype(i, /obj/item/bio_chip/traitor))
qdel(i)
break
remove_antag_datum(/datum/antagonist/mindslave)
+8 -8
View File
@@ -25,7 +25,7 @@
var/internals_slot = null //ID of slot containing a gas tank
var/list/backpack_contents = list() // In the list(path=count,otherpath=count) format
var/box // Internals box. Will be inserted at the start of backpack_contents
var/list/implants = list()
var/list/bio_chips = list()
var/list/cybernetic_implants = list()
var/list/accessories = list()
@@ -136,9 +136,9 @@
H.internal = H.get_item_by_slot(internals_slot)
H.update_action_buttons_icon()
if(implants)
for(var/implant_type in implants)
var/obj/item/implant/I = new implant_type(H)
if(bio_chips)
for(var/bio_chip_type in bio_chips)
var/obj/item/bio_chip/I = new bio_chip_type(H)
I.implant(H, null)
H.update_body()
@@ -232,12 +232,12 @@
backpack_contents[itype] = backpack[item]
box = text2path(outfit_data["box"])
var/list/impl = outfit_data["implants"]
implants = list()
var/list/impl = outfit_data["bio_chips"]
bio_chips = list()
for(var/I in impl)
var/imptype = text2path(I)
if(imptype)
implants += imptype
bio_chips += imptype
var/list/cybernetic_impl = outfit_data["cybernetic_implants"]
cybernetic_implants = list()
@@ -281,7 +281,7 @@
.["internals_slot"] = internals_slot
.["backpack_contents"] = backpack_contents
.["box"] = box
.["implants"] = implants
.["bio_chips"] = bio_chips
.["cybernetic_implants"] = cybernetic_implants
.["accessories"] = accessories
+27 -27
View File
@@ -113,7 +113,7 @@
if(visualsOnly)
return
var/obj/item/implant/explosive/E = new(H)
var/obj/item/bio_chip/explosive/E = new(H)
E.implant(H)
@@ -136,8 +136,8 @@
uplink_uses = 200
id_access = "Syndicate Agent"
implants = list(
/obj/item/implant/dust
bio_chips = list(
/obj/item/bio_chip/dust
)
@@ -181,11 +181,11 @@
pda = /obj/item/pda/centcom
backpack_contents = list(
/obj/item/storage/box/centcomofficer = 1,
/obj/item/implanter/death_alarm = 1
/obj/item/bio_chip_implanter/death_alarm = 1
)
implants = list(
/obj/item/implant/mindshield,
/obj/item/implant/dust
bio_chips = list(
/obj/item/bio_chip/mindshield,
/obj/item/bio_chip/dust
)
/datum/outfit/admin/nt_navy_captain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -212,11 +212,11 @@
pda = /obj/item/pda/centcom
backpack_contents = list(
/obj/item/storage/box/survival = 1,
/obj/item/implanter/death_alarm = 1,
/obj/item/bio_chip_implanter/death_alarm = 1,
)
implants = list(
/obj/item/implant/mindshield,
/obj/item/implant/dust
bio_chips = list(
/obj/item/bio_chip/mindshield,
/obj/item/bio_chip/dust
)
/datum/outfit/admin/nt_diplomat/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -246,8 +246,8 @@
/obj/item/flashlight = 1,
/obj/item/pinpointer/crew = 1
)
implants = list(
/obj/item/implant/dust
bio_chips = list(
/obj/item/bio_chip/dust
)
cybernetic_implants = list(
/obj/item/organ/internal/cyberimp/eyes/hud/security,
@@ -299,9 +299,9 @@
/obj/item/shield/energy,
)
implants = list(
/obj/item/implant/mindshield, // No death alarm, Deathsquad are silent
/obj/item/implant/dust
bio_chips = list(
/obj/item/bio_chip/mindshield, // No death alarm, Deathsquad are silent
/obj/item/bio_chip/dust
)
/datum/outfit/admin/deathsquad_commando/leader
@@ -701,12 +701,12 @@
pda = /obj/item/pda
backpack_contents = list(
/obj/item/storage/box/responseteam = 1,
/obj/item/implanter/dust = 1,
/obj/item/implanter/death_alarm = 1,
/obj/item/bio_chip_implanter/dust = 1,
/obj/item/bio_chip_implanter/death_alarm = 1,
)
implants = list(/obj/item/implant/mindshield,
/obj/item/implant/death_alarm
bio_chips = list(/obj/item/bio_chip/mindshield,
/obj/item/bio_chip/death_alarm
)
/datum/outfit/admin/solgov_rep/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -749,8 +749,8 @@
/obj/item/organ/internal/cyberimp/chest/nutriment/hardened,
/obj/item/organ/internal/cyberimp/eyes/hud/security
)
implants = list(/obj/item/implant/mindshield,
/obj/item/implant/death_alarm
bio_chips = list(/obj/item/bio_chip/mindshield,
/obj/item/bio_chip/death_alarm
)
var/is_solgov_lieutenant = FALSE
@@ -1041,7 +1041,7 @@
. = ..()
for(var/obj/item/I in H.contents)
if(!istype(I, /obj/item/implant))
if(!istype(I, /obj/item/bio_chip))
I.add_mob_blood(H)
if(visualsOnly)
@@ -1076,7 +1076,7 @@
. = ..()
for(var/obj/item/I in H.contents)
if(!istype(I, /obj/item/implant))
if(!istype(I, /obj/item/bio_chip))
I.add_mob_blood(H)
if(visualsOnly)
@@ -1273,8 +1273,8 @@
/obj/item/storage/box/survival = 1,
/obj/item/flashlight = 1,
)
implants = list(
/obj/item/implant/dust
bio_chips = list(
/obj/item/bio_chip/dust
)
/datum/outfit/admin/dark_priest/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -1371,7 +1371,7 @@
shoes = /obj/item/clothing/shoes/black
box = /obj/item/storage/box/survival
backpack_contents = list(
/obj/item/implanter/dust = 1
/obj/item/bio_chip_implanter/dust = 1
)
/datum/outfit/admin/observer/plasmaman
+5 -5
View File
@@ -116,13 +116,13 @@
O.backpack_contents = typecounts
// TODO : Copy varedits from backpack stuff too.
// Copy implants
O.implants = list()
for(var/obj/item/implant/I in contents)
//Copy biochips
O.bio_chips = list()
for(var/obj/item/bio_chip/I in contents)
if(istype(I))
O.implants |= I.type
O.bio_chips |= I.type
// Copy cybernetic implants
// Copy cybernetic biochips
O.cybernetic_implants = list()
for(var/org in internal_organs)
var/obj/item/organ/internal/aug = org
+1 -1
View File
@@ -119,7 +119,7 @@
/obj/structure/cable,
/obj/machinery/atmospherics,
/obj/item/ammo_casing,
/obj/item/implant,
/obj/item/bio_chip,
/obj/singularity,
))
if(!can_contaminate || !can_contam || blacklisted[thing.type])
@@ -22,7 +22,7 @@
)
var/list/own_blacklist = list(
/obj/item/organ,
/obj/item/implant
/obj/item/bio_chip
)
/datum/spell_targeting/matter_eater/choose_targets(mob/user, obj/effect/proc_holder/spell/spell, params, atom/clicked_atom)
+14 -14
View File
@@ -740,50 +740,50 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
// IMPLANTS
/datum/uplink_item/implants
category = "Implants"
/datum/uplink_item/bio_chips
category = "Bio-chips"
/datum/uplink_item/implants/freedom
/datum/uplink_item/bio_chips/freedom
name = "Freedom Bio-chip"
desc = "A bio-chip injected into the body and later activated manually to break out of any restraints or grabs. Can be activated up to 4 times."
reference = "FI"
item = /obj/item/implanter/freedom
item = /obj/item/bio_chip_implanter/freedom
cost = 25
/datum/uplink_item/implants/protofreedom
/datum/uplink_item/bio_chips/protofreedom
name = "Prototype Freedom Bio-chip"
desc = "A prototype bio-chip injected into the body and later activated manually to break out of any restraints or grabs. Can only be activated a singular time."
reference = "PFI"
item = /obj/item/implanter/freedom/prototype
item = /obj/item/bio_chip_implanter/freedom/prototype
cost = 10
/datum/uplink_item/implants/storage
/datum/uplink_item/bio_chips/storage
name = "Storage Bio-chip"
desc = "A bio-chip injected into the body, and later activated at the user's will. It will open a small subspace pocket capable of storing two items."
reference = "ESI"
item = /obj/item/implanter/storage
item = /obj/item/bio_chip_implanter/storage
cost = 40
/datum/uplink_item/implants/mindslave
/datum/uplink_item/bio_chips/mindslave
name = "Mindslave Bio-chip"
desc = "A box containing a bio-chip implanter filled with a mindslave bio-chip that when injected into another person makes them loyal to you and your cause, unless of course they're already implanted by someone else. Loyalty ends if the implant is no longer in their system."
reference = "MI"
item = /obj/item/implanter/traitor
item = /obj/item/bio_chip_implanter/traitor
cost = 50
/datum/uplink_item/implants/adrenal
/datum/uplink_item/bio_chips/adrenal
name = "Adrenal Bio-chip"
desc = "A bio-chip injected into the body, and later activated manually to inject a chemical cocktail, which has a mild healing effect along with removing and reducing the time of all stuns and increasing movement speed. Can be activated up to 3 times."
reference = "AI"
item = /obj/item/implanter/adrenalin
item = /obj/item/bio_chip_implanter/adrenalin
cost = 40
/datum/uplink_item/implants/stealthimplant
/datum/uplink_item/bio_chips/stealthimplant
name = "Stealth Bio-chip"
desc = "This one-of-a-kind implant will make you almost invisible if you play your cards right. \
On activation, it will conceal you inside a chameleon cardboard box that is only revealed once someone bumps into it."
reference = "SI"
item = /obj/item/implanter/stealth
item = /obj/item/bio_chip_implanter/stealth
cost = 45
// POINTLESS BADASSERY
+8 -8
View File
@@ -508,35 +508,35 @@
// IMPLANTS
/datum/uplink_item/implants/krav_implant
/datum/uplink_item/bio_chips/krav_implant
name = "Krav Maga Implant"
desc = "A biochip that teaches you Krav Maga when implanted, great as a cheap backup weapon. Warning: the biochip will override any other fighting styles such as CQC while active."
reference = "KMI"
item = /obj/item/implanter/krav_maga
item = /obj/item/bio_chip_implanter/krav_maga
cost = 25
uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
/datum/uplink_item/implants/uplink/nuclear
/datum/uplink_item/bio_chips/uplink/nuclear
name = "Nuclear Uplink Bio-chip"
reference = "UIN"
item = /obj/item/implanter/nuclear
item = /obj/item/bio_chip_implanter/nuclear
excludefrom = list()
uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
/datum/uplink_item/implants/microbomb
/datum/uplink_item/bio_chips/microbomb
name = "Microbomb Bio-chip"
desc = "A bio-chip injected into the body, and later activated either manually or automatically upon death. The more implants inside of you, the higher the explosive power. \
This will permanently destroy your body, however."
reference = "MBI"
item = /obj/item/implanter/explosive
item = /obj/item/bio_chip_implanter/explosive
cost = 10
uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
/datum/uplink_item/implants/macrobomb
/datum/uplink_item/bio_chips/macrobomb
name = "Macrobomb Bio-chip"
desc = "A bio-chip injected into the body, and later activated either manually or automatically upon death. Upon death, releases a massive explosion that will wipe out everything nearby."
reference = "HAB"
item = /obj/item/implanter/explosive_macro
item = /obj/item/bio_chip_implanter/explosive_macro
cost = 50
uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
+4 -4
View File
@@ -290,7 +290,7 @@
desc = "A single-use bio-chip which contains an experimental serum that causes rapid muscular growth in Hominidae. \
Side-affects may include hypertrichosis, violent outbursts, and an unending affinity for bananas."
reference = "MAG"
item = /obj/item/implanter/gorilla_rampage
item = /obj/item/bio_chip_implanter/gorilla_rampage
cost = 25
job = list("Research Director", "Geneticist")
@@ -340,7 +340,7 @@
name = "Synthetic Supercharge Bio-chip"
desc = "A bio-chip injected into the body, and later activated manually to inject a chemical cocktail, which has the effect of removing and reducing the time of all stuns and increasing movement speed. Can be activated up to 3 times."
reference = "SSI"
item = /obj/item/implanter/supercharge
item = /obj/item/bio_chip_implanter/supercharge
cost = 40
species = list("Machine")
surplus = 0
@@ -506,11 +506,11 @@
surplus = 60
excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
/datum/uplink_item/implants/uplink // Nukies get Nuclear Uplink Bio-chip instead
/datum/uplink_item/bio_chips/uplink // Nukies get Nuclear Uplink Bio-chip instead
name = "Uplink Bio-chip"
desc = "A bio-chip injected into the body, and later activated manually to open an uplink with 50 telecrystals. The ability for an agent to open an uplink after their possessions have been stripped from them makes this implant excellent for escaping confinement."
reference = "UI"
item = /obj/item/implanter/uplink
item = /obj/item/bio_chip_implanter/uplink
cost = 70
excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
surplus = 0