cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 11:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renames non-cybernetic implants to bio-chips (#18937)

Browse Source 
* CHIPS

* microchip implanter

* more chips to purge

* bio-chip

* catches more things

* tgui

* final merge changes

* Update code/game/machinery/cloning.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* oops

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
This commit is contained in:
S34N
2022-09-24 14:24:25 +01:00
committed by GitHub
parent 6956bc64a8
commit 924e8cc949
38 changed files with 225 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/infiltratorteam_syndicate.dm
+2 -2
View File
@@ -87,7 +87,7 @@ GLOBAL_VAR_INIT(sent_syndicate_infiltration_team, 0)
new_syndicate_infiltrator.update_action_buttons_icon()
infiltrators -= theguy
to_chat(new_syndicate_infiltrator, "<span class='danger'>You are a [!syndicate_leader_selected?"Infiltrator":"<B>Lead Infiltrator</B>"] in the service of the Syndicate. \nYour current mission is: <B>[input]</B></span>")
to_chat(new_syndicate_infiltrator, "<span class='notice'>You are equipped with an uplink implant to help you achieve your objectives. ((activate it via button in top left of screen))</span>")
to_chat(new_syndicate_infiltrator, "<span class='notice'>You are equipped with an uplink bio-chip to help you achieve your objectives. ((activate it via button in top left of screen))</span>")
new_syndicate_infiltrator.faction += "syndicate"
GLOB.data_core.manifest_inject(new_syndicate_infiltrator)
if(syndicate_leader_selected)
@@ -102,7 +102,7 @@ GLOBAL_VAR_INIT(sent_syndicate_infiltration_team, 0)
to_chat(new_syndicate_infiltrator, "<span class='notice'>You have more helpful information stored in your Notes.</span>")
new_syndicate_infiltrator.mind.store_memory("<B>Mission:</B> [input] ")
new_syndicate_infiltrator.mind.store_memory("<B>Team Leader:</B> [team_leader] ")
new_syndicate_infiltrator.mind.store_memory("<B>Starting Equipment:</B> <BR>- Syndicate Headset ((.h for your radio))<BR>- Chameleon Jumpsuit ((right click to Change Color))<BR> - Agent ID card ((disguise as another job))<BR> - Uplink Implant ((top left of screen)) <BR> - Dust Implant ((destroys your body on death)) <BR> - Combat Gloves ((insulated, disguised as black gloves)) <BR> - Anything bought with your uplink implant")
new_syndicate_infiltrator.mind.store_memory("<B>Starting Equipment:</B> <BR>- Syndicate Headset ((.h for your radio))<BR>- Chameleon Jumpsuit ((right click to Change Color))<BR> - Agent ID card ((disguise as another job))<BR> - Uplink Bio-chip ((top left of screen)) <BR> - Dust Bio-chip ((destroys your body on death)) <BR> - Combat Gloves ((insulated, disguised as black gloves)) <BR> - Anything bought with your uplink bio-chip")
var/datum/atom_hud/antag/opshud = GLOB.huds[ANTAG_HUD_OPS]
opshud.join_hud(new_syndicate_infiltrator.mind.current)
set_antag_hud(new_syndicate_infiltrator.mind.current, "hudoperative")
code/modules/awaymissions/gateway.dm
+4 -4
View File
@@ -252,12 +252,12 @@ GLOBAL_DATUM_INIT(the_gateway, /obj/machinery/gateway/centerstation, null)
else
for(var/mob/living/L in AM.contents)
if(exilecheck(L))
atom_say("Rejecting [AM]: Exile implant detected in contained lifeform.")
atom_say("Rejecting [AM]: Exile bio-chip detected in contained lifeform.")
return
if(AM.has_buckled_mobs())
for(var/mob/living/L in AM.buckled_mobs)
if(exilecheck(L))
atom_say("Rejecting [AM]: Exile implant detected in close proximity lifeform.")
atom_say("Rejecting [AM]: Exile bio-chip detected in close proximity lifeform.")
return
AM.forceMove(get_step(stationgate.loc, SOUTH))
AM.setDir(SOUTH)
@@ -267,9 +267,9 @@ GLOBAL_DATUM_INIT(the_gateway, /obj/machinery/gateway/centerstation, null)
M.client.move_delay = max(world.time + 5, M.client.move_delay)
/obj/machinery/gateway/centeraway/proc/exilecheck(mob/living/carbon/M)
for(var/obj/item/implant/exile/E in M)//Checking that there is an exile implant in the contents
for(var/obj/item/implant/exile/E in M)//Checking that there is an exile bio-chip in the contents
if(E.imp_in == M)//Checking that it's actually implanted vs just in their pocket
to_chat(M, "<span class='notice'>The station gate has detected your exile implant and is blocking your entry.</span>")
to_chat(M, "<span class='notice'>The station gate has detected your exile bio-chip and is blocking your entry.</span>")
return 1
return 0
code/modules/mining/machine_vending.dm
+1 -1
View File
@@ -40,7 +40,7 @@
EQUIPMENT("Lazarus Capsule", /obj/item/mobcapsule, 800),
EQUIPMENT("Lazarus Capsule belt", /obj/item/storage/belt/lazarus, 200),
EQUIPMENT("Mining Hardsuit", /obj/item/clothing/suit/space/hardsuit/mining, 2000),
EQUIPMENT("Tracking Implant Kit", /obj/item/storage/box/minertracker, 600),
EQUIPMENT("Tracking Bio-chip Kit", /obj/item/storage/box/minertracker, 600),
)
prize_list["Consumables"] = list(
EQUIPMENT("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 100),
code/modules/mob/living/carbon/superheroes.dm
+2 -2
View File
@@ -199,14 +199,14 @@
if(ismindshielded(target))
to_chat(user, "<span class='notice'>[target.p_they(TRUE)] are enslaved by Nanotrasen. You feel [target.p_their()] interest in your cause wane and disappear.</span>")
user.visible_message("<span class='danger'>[user] stops talking for a moment, then moves back away from [target].</span>")
to_chat(target, "<span class='danger'>Your mindshield implant activates, protecting you from conversion.</span>")
to_chat(target, "<span class='danger'>Your mindshield bio-chip activates, protecting you from conversion.</span>")
return
if(3)
to_chat(user, "<span class='notice'>You begin filling out the application form with [target].</span>")
user.visible_message("<span class='danger'>[user] pulls out a pen and paper and begins filling an application form with [target].</span>")
to_chat(target, "<span class='danger'>You are being convinced by [user] to fill out an application form to become a henchman.</span>")//Ow the edge
if(!do_mob(user, target, 100)) //around 30 seconds total for enthralling, 45 for someone with a mindshield implant
if(!do_mob(user, target, 100)) //around 30 seconds total for enthralling, 45 for someone with a mindshield bio-chip
to_chat(user, "<span class='danger'>The enrollment process has been interrupted - you have lost the attention of [target].</span>")
to_chat(target, "<span class='warning'>You move away and are no longer under the charm of [user]. The application form is null and void.</span>")
recruiting = FALSE
code/modules/paperwork/paper.dm
+1 -1
View File
@@ -611,7 +611,7 @@
/obj/item/paper/armory
name = "paper- 'Armory Inventory'"
info = "4 Deployable Barriers<br>4 Portable Flashers<br>1 Mechanical Toolbox<br>2 Boxes of Spare Handcuffs<br>1 Box of Flashbangs<br>1 Box of Spare R.O.B.U.S.T. Cartridges<br>1 Tracking Implant Kit<br>1 Chemical Implant Kit<br>1 Box of Tear Gas Grenades<br>1 Explosive Ordnance Disposal Suit<br>1 Biohazard Suit<br>6 Gas Masks<br>1 Lockbox of Mindshield Implants<br>1 Ion Rifle<br>3 Sets of Riot Equipment<br>2 Sets of Security Hardsuits<br>1 Ablative Armor Vest<br>3 Bulletproof Vests<br>3 Helmets<br><br>2 Riot Shotguns<br>2 Boxes of Beanbag Shells<br>3 Laser Guns<br>3 Energy Guns<br>3 Disablers"
info = "4 Deployable Barriers<br>4 Portable Flashers<br>1 Mechanical Toolbox<br>2 Boxes of Spare Handcuffs<br>1 Box of Flashbangs<br>1 Box of Spare R.O.B.U.S.T. Cartridges<br>1 Tracking Bio-chip Kit<br>1 Chemical Bio-chip Kit<br>1 Box of Tear Gas Grenades<br>1 Explosive Ordnance Disposal Suit<br>1 Biohazard Suit<br>6 Gas Masks<br>1 Lockbox of Mindshield Implants<br>1 Ion Rifle<br>3 Sets of Riot Equipment<br>2 Sets of Security Hardsuits<br>1 Ablative Armor Vest<br>3 Bulletproof Vests<br>3 Helmets<br><br>2 Riot Shotguns<br>2 Boxes of Beanbag Shells<br>3 Laser Guns<br>3 Energy Guns<br>3 Disablers"
/obj/item/paper/firingrange
name = "paper- 'Firing Range Instructions'"
code/modules/research/designs/medical_designs.dm
+9 -9
View File
@@ -524,8 +524,8 @@
/////////////////////////////////////////
/datum/design/implanter
name = "Implanter"
desc = "A sterile automatic implant injector."
name = "bio-chip implanter"
desc = "A sterile automatic bio-chip injector."
id = "implanter"
req_tech = list("materials" = 2, "biotech" = 3, "programming" = 2)
build_type = PROTOLATHE
@@ -534,8 +534,8 @@
category = list("Medical")
/datum/design/implantcase
name = "Implant Case"
desc = "A glass case containing an implant."
name = "Bio-chip Case"
desc = "A glass case containing a bio-chip."
id = "implantcase"
req_tech = list("biotech" = 2)
build_type = PROTOLATHE
@@ -544,8 +544,8 @@
category = list("Medical")
/datum/design/implant_chem
name = "Chemical Implant Case"
desc = "A glass case containing an implant."
name = "Chemical Bio-chip Case"
desc = "A glass case containing a bio-chip."
id = "implant_chem"
req_tech = list("materials" = 3, "biotech" = 5)
build_type = PROTOLATHE
@@ -554,7 +554,7 @@
category = list("Medical")
/datum/design/implant_sadtrombone
name = "Sad Trombone Implant Case"
name = "Sad Trombone Bio-chip Case"
desc = "Makes death amusing."
id = "implant_trombone"
req_tech = list("materials" = 3, "biotech" = 5)
@@ -564,8 +564,8 @@
category = list("Medical")
/datum/design/implant_tracking
name = "Tracking Implant Case"
desc = "A glass case containing an implant."
name = "Tracking Bio-chip Case"
desc = "A glass case containing a bio-chip."
id = "implant_tracking"
req_tech = list("materials" = 2, "biotech" = 3, "magnets" = 3, "programming" = 2)
build_type = PROTOLATHE
code/modules/surgery/implant_removal.dm
+3 -3
View File
@@ -3,7 +3,7 @@
//////////////////////////////////////////////////////////////////
/datum/surgery/implant_removal
name = "Implant Removal"
name = "Bio-chip Removal"
steps = list(
/datum/surgery_step/generic/cut_open,
/datum/surgery_step/generic/clamp_bleeders,
@@ -16,7 +16,7 @@
requires_organic_bodypart = TRUE
/datum/surgery/implant_removal/synth
name = "Implant Removal"
name = "Bio-chip Removal"
steps = list(
/datum/surgery_step/robotics/external/unscrew_hatch,
/datum/surgery_step/robotics/external/open_hatch,
@@ -27,7 +27,7 @@
requires_organic_bodypart = FALSE
/datum/surgery_step/extract_implant
name = "extract implant"
name = "extract bio-chip"
allowed_tools = list(TOOL_HEMOSTAT = 100, TOOL_CROWBAR = 65)
time = 6.4 SECONDS
repeatable = TRUE