cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-08-23 21:16:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changing Nanotrasen to Kinaris where needed

Browse Source
This commit is contained in:
Chloe Carver-Brown
2020-12-31 17:58:25 +00:00
parent 63506caa48
commit c2a937bb73
105 changed files with 186 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/shoes/miscellaneous.dm
+1 -1
View File
@@ -155,7 +155,7 @@
/obj/item/clothing/shoes/workboots
name = "work boots"
desc = "Nanotrasen-issue Engineering lace-up work boots for the especially blue-collar."
desc = "Kinaris-issue Engineering lace-up work boots for the especially blue-collar."
icon_state = "workboots"
item_state = "workboots"
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
code/modules/clothing/spacesuits/miscellaneous.dm
+1 -1
View File
@@ -46,7 +46,7 @@ Contains:
//NEW SWAT suit
/obj/item/clothing/suit/space/swat
name = "MK.I SWAT Suit"
desc = "A tactical space suit first developed in a joint effort by the defunct IS-ERI and Nanotrasen in 20XX for military space operations. A tried and true workhorse, it is very difficult to move in but offers robust protection against all threats!"
desc = "A tactical space suit first developed in a joint effort by the defunct IS-ERI and Kinaris in 20XX for military space operations. A tried and true workhorse, it is very difficult to move in but offers robust protection against all threats!"
icon_state = "heavy"
item_state = "swat_suit"
allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/kitchen/knife/combat)
code/modules/clothing/suits/armor.dm
+1 -1
View File
@@ -96,7 +96,7 @@
/obj/item/clothing/suit/armor/vest/leather
name = "security overcoat"
desc = "Lightly armored leather overcoat meant as casual wear for high-ranking officers. Bears the crest of Nanotrasen Security."
desc = "Lightly armored leather overcoat meant as casual wear for high-ranking officers. Bears the crest of Kinaris Security."
icon_state = "leathercoat-sec"
item_state = "hostrench"
body_parts_covered = CHEST|GROIN|ARMS|LEGS
code/modules/clothing/under/accessories.dm
+4 -4
View File
@@ -127,7 +127,7 @@
"<span class='notice'>You try to pin [src] on [M]'s chest.</span>")
var/input
if(!commended && user != M)
input = stripped_input(user,"Please input a reason for this commendation, it will be recorded by Nanotrasen.", ,"", 140)
input = stripped_input(user,"Please input a reason for this commendation, it will be recorded by Kinaris.", ,"", 140)
if(do_after(user, delay, target = M))
if(U.attach_accessory(src, user, 0)) //Attach it, do not notify the user of the attachment
if(user == M)
@@ -150,7 +150,7 @@
/obj/item/clothing/accessory/medal/conduct
name = "distinguished conduct medal"
desc = "A bronze medal awarded for distinguished conduct. Whilst a great honor, this is the most basic award given by Nanotrasen. It is often awarded by a captain to a member of his crew."
desc = "A bronze medal awarded for distinguished conduct. Whilst a great honor, this is the most basic award given by Kinaris. It is often awarded by a captain to a member of his crew."
/obj/item/clothing/accessory/medal/bronze_heart
name = "bronze heart medal"
@@ -196,7 +196,7 @@
/obj/item/clothing/accessory/medal/silver/security
name = "robust security award"
desc = "An award for distinguished combat and sacrifice in defence of Nanotrasen's commercial interests. Often awarded to security staff."
desc = "An award for distinguished combat and sacrifice in defence of Kinaris's commercial interests. Often awarded to security staff."
/obj/item/clothing/accessory/medal/gold
name = "gold medal"
@@ -208,7 +208,7 @@
/obj/item/clothing/accessory/medal/gold/captain
name = "medal of captaincy"
desc = "A golden medal awarded exclusively to those promoted to the rank of captain. It signifies the codified responsibilities of a captain to Nanotrasen, and their undisputable authority over their crew."
desc = "A golden medal awarded exclusively to those promoted to the rank of captain. It signifies the codified responsibilities of a captain to Kinaris, and their undisputable authority over their crew."
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
/obj/item/clothing/accessory/medal/gold/captain/family
code/modules/clothing/under/jobs/civilian.dm
+2 -2
View File
@@ -340,7 +340,7 @@
/obj/item/clothing/under/lawyer/blacksuit
name = "black suit"
desc = "A professional black suit. Nanotrasen Investigation Bureau approved!"
desc = "A professional black suit. Kinaris Investigation Bureau approved!"
icon_state = "blacksuit"
item_state = "bar_suit"
item_color = "blacksuit"
@@ -349,7 +349,7 @@
/obj/item/clothing/under/lawyer/blacksuit/skirt
name = "black suitskirt"
desc = "A professional black suit. Nanotrasen Investigation Bureau approved!"
desc = "A professional black suit. Kinaris Investigation Bureau approved!"
icon_state = "blacksuit_skirt"
item_state = "bar_suit"
item_color = "blacksuit_skirt"
code/modules/clothing/under/miscellaneous.dm
+2 -2
View File
@@ -61,7 +61,7 @@
can_adjust = FALSE
/obj/item/clothing/under/rank/prisoner
name = "prison jumpsuit"
desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
desc = "It's standardised Kinaris prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
icon_state = "prisoner"
item_state = "o_suit"
item_color = "prisoner"
@@ -71,7 +71,7 @@
/obj/item/clothing/under/rank/prisoner/skirt
name = "prison jumpskirt"
desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
desc = "It's standardised Kinaris prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
icon_state = "prisoner_skirt"
item_state = "o_suit"
item_color = "prisoner_skirt"