mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 19:47:22 +01:00
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:
co-authored by
Burzah
Contrabang
S34N
parent
fad6509b5e
commit
382a71df0d
@@ -14,7 +14,7 @@
|
||||
/obj/item/antag_spawner/nuke_ops
|
||||
name = "syndicate operative teleporter"
|
||||
desc = "A single-use teleporter designed to quickly reinforce operatives in the field."
|
||||
icon = 'icons/obj/implants.dmi'
|
||||
icon = 'icons/obj/bio_chips.dmi'
|
||||
icon_state = "locator"
|
||||
var/borg_to_spawn
|
||||
var/checking = FALSE
|
||||
|
||||
@@ -376,11 +376,11 @@
|
||||
continue
|
||||
|
||||
// Any kind of implant gets potentially removed (mindshield, freedoms, etc)
|
||||
if(istype(I, /obj/item/implant))
|
||||
if(istype(I, /obj/item/implant/storage)) // Storage items are removed and placed in the confiscation locker before the implant is taken.
|
||||
var/obj/item/implant/storage/storage_implant = I
|
||||
for(var/it in storage_implant.storage)
|
||||
storage_implant.storage.remove_from_storage(it)
|
||||
if(istype(I, /obj/item/bio_chip))
|
||||
if(istype(I, /obj/item/bio_chip/storage)) // Storage items are removed and placed in the confiscation locker before the implant is taken.
|
||||
var/obj/item/bio_chip/storage/storage_chip = I
|
||||
for(var/it in storage_chip.storage)
|
||||
storage_chip.storage.remove_from_storage(it)
|
||||
stuff_to_transfer += it
|
||||
qdel(I)
|
||||
continue
|
||||
@@ -553,7 +553,7 @@
|
||||
victim_belongings = list()
|
||||
|
||||
// Clean up
|
||||
var/obj/item/implant/uplink/uplink_implant = locate() in M
|
||||
var/obj/item/bio_chip/uplink/uplink_implant = locate() in M
|
||||
uplink_implant?.hidden_uplink?.is_jammed = FALSE
|
||||
|
||||
QDEL_LIST_CONTENTS(temp_objs)
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
/obj/item/encryptionkey/binary,
|
||||
/obj/item/jammer,
|
||||
/obj/item/clothing/under/syndicate/silicon_cham,
|
||||
/obj/item/implanter/freedom,
|
||||
/obj/item/bio_chip_implanter/freedom,
|
||||
)
|
||||
|
||||
|
||||
|
||||
@@ -61,7 +61,7 @@
|
||||
qdel(uplink)
|
||||
|
||||
// Check for an uplink implant
|
||||
var/uplink_implant = locate(/obj/item/implant/uplink) in M.contents
|
||||
var/uplink_implant = locate(/obj/item/bio_chip/uplink) in M.contents
|
||||
if(uplink_implant)
|
||||
qdel(uplink_implant)
|
||||
|
||||
|
||||
@@ -333,10 +333,10 @@
|
||||
visible_message("<span class='warning'>[H] looks to be stunned by the energy!</span>")
|
||||
H.Weaken(40 SECONDS)
|
||||
return
|
||||
for(var/obj/item/implant/mindshield/L in H)
|
||||
for(var/obj/item/bio_chip/mindshield/L in H)
|
||||
if(L && L.implanted)
|
||||
qdel(L)
|
||||
for(var/obj/item/implant/traitor/T in H)
|
||||
for(var/obj/item/bio_chip/traitor/T in H)
|
||||
if(T && T.implanted)
|
||||
qdel(T)
|
||||
visible_message("<span class='warning'>[H] gets an eerie red glow in their eyes!</span>")
|
||||
|
||||
Reference in New Issue
Block a user