forked from tgstation/tgstation
-
Notifications
You must be signed in to change notification settings - Fork 48
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add detective forensic gloves & sorting out objects module (#866)
### Изменение Добавил детективные перчатки, и +- отсортировал папку objects. ### Изображение 
- Loading branch information
Showing
67 changed files
with
145 additions
and
113 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| /datum/modpack/jobs | ||
| name = "Расширение и дополнение работ" | ||
| desc = "Добавляет новые работы, расширяет и изменяет имеющиеся." | ||
| author = "dj-34" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| #include "_jobs.dm" | ||
|
|
||
| #include "code/detective/detective.dm" | ||
| #include "code/detective/forensics.dm" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| // Outfit changes | ||
| /datum/outfit/job/detective | ||
| gloves = /obj/item/clothing/gloves/color/black/forensics // Override: /obj/item/clothing/gloves/color/black |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| // Check for fiberless flag to skip adding fibers | ||
| /datum/forensics/add_fibers(mob/living/carbon/human/suspect) | ||
| if(suspect.gloves?.clothing_flags & FIBERLESS_GLOVES) | ||
| return FALSE | ||
| . = ..() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,38 +1,34 @@ | ||
| #include "_objects.dm" | ||
|
|
||
| #include "code/hampters.dm" | ||
| #include "code/material_pouch.dm" | ||
| #include "code/papershredder.dm" | ||
| #include "code/platform.dm" | ||
| #include "code/shuttles.dm" | ||
| #include "code/wallets.dm" | ||
|
|
||
| #include "code/clothing/eyes/eyes.dm" | ||
| #include "code/clothing/gloves/gloves.dm" | ||
| #include "code/clothing/head/hat.dm" | ||
| #include "code/clothing/head/soft_caps.dm" | ||
| #include "code/clothing/shoes/shoes.dm" | ||
| #include "code/clothing/suits/armor.dm" | ||
| #include "code/clothing/suits/cloaks.dm" | ||
| #include "code/clothing/suits/jacket.dm" | ||
| #include "code/clothing/suits/wintercoats.dm" | ||
| #include "code/clothing/under/jobs/centcom.dm" | ||
| #include "code/clothing/under/jobs/rnd.dm" | ||
|
|
||
| #include "code/consumables/drinks.dm" | ||
| #include "code/consumables/customer_data.dm" | ||
|
|
||
| #include "code/effects/turf_decal.dm" | ||
|
|
||
| #include "code/items/clothing/glasses/glasses.dm" | ||
| #include "code/items/clothing/gloves/gloves.dm" | ||
| #include "code/items/clothing/head/hat.dm" | ||
| #include "code/items/clothing/head/soft_caps.dm" | ||
| #include "code/items/clothing/shoes/shoes.dm" | ||
| #include "code/items/clothing/suits/armor.dm" | ||
| #include "code/items/clothing/suits/cloaks.dm" | ||
| #include "code/items/clothing/suits/jacket.dm" | ||
| #include "code/items/clothing/suits/wintercoats.dm" | ||
| #include "code/items/clothing/under/jobs/centcom.dm" | ||
| #include "code/items/clothing/under/jobs/research.dm" | ||
| #include "code/items/consumables/customer_data.dm" | ||
| #include "code/items/consumables/drinks.dm" | ||
| #include "code/items/weapons/melee/centcom/rapier.dm" | ||
| #include "code/items/weapons/ranged/energy/awaymission_gun.dm" | ||
| #include "code/items/banners.dm" | ||
| #include "code/items/hampters.dm" | ||
| #include "code/items/material_pouch.dm" | ||
| #include "code/items/wallets.dm" | ||
|
|
||
| #include "code/machinery/vending/vending.dm" | ||
| #include "code/machinery/papershredder.dm" | ||
| #include "code/machinery/photocopier.dm" | ||
|
|
||
| #include "code/structures/chairs.dm" | ||
| #include "code/structures/platform.dm" | ||
| #include "code/structures/posters.dm" | ||
| #include "code/structures/statues.dm" | ||
|
|
||
| #include "code/vending/vending.dm" | ||
|
|
||
| #include "code/weapons/ranged/awaymission_gun.dm" | ||
| #include "code/weapons/melee/centcom/rapier.dm" | ||
| #include "code/shuttles.dm" |
16 changes: 0 additions & 16 deletions
16
modular_bandastation/objects/code/clothing/gloves/gloves.dm
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 0 additions & 2 deletions
2
...tation/objects/code/clothing/eyes/eyes.dm → ...ts/code/items/clothing/glasses/glasses.dm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
modular_bandastation/objects/code/items/clothing/gloves/gloves.dm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| // CentCom | ||
| /obj/item/clothing/gloves/combat/centcom | ||
| name = "fleet officer's gloves" | ||
| desc = "Солидные перчатки офицеров Центрального Командования Нанотрейзен." | ||
| icon = 'modular_bandastation/aesthetics/clothing/centcom/icons/obj/clothing/gloves/gloves.dmi' | ||
| worn_icon = 'modular_bandastation/aesthetics/clothing/centcom/icons/mob/clothing/gloves/gloves.dmi' | ||
| lefthand_file = 'modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/gloves_lefthand.dmi' | ||
| righthand_file = 'modular_bandastation/aesthetics/clothing/centcom/icons/inhands/clothing/gloves_righthand.dmi' | ||
| icon_state = "centcom" | ||
| resistance_flags = INDESTRUCTIBLE | FIRE_PROOF | FREEZE_PROOF | UNACIDABLE | ACID_PROOF | ||
|
|
||
| /obj/item/clothing/gloves/combat/centcom/diplomat | ||
| desc = "Изящные и солидные перчатки офицеров Центрального Командования Нанотрейзен." | ||
| icon_state = "centcom_diplomat" | ||
|
|
||
| // Detective (forensics) gloves | ||
| /obj/item/clothing/gloves/color/black/forensics | ||
| name = "forensics gloves" | ||
| desc = "Эти высокотехнологичные перчатки не оставляют никаких следов на предметах, к которым прикасаются. Идеально подходят для того, чтобы оставить место преступления нетронутым... как до, так и после преступления." | ||
| icon = 'modular_bandastation/objects/icons/obj/clothing/gloves.dmi' | ||
| worn_icon = 'modular_bandastation/objects/icons/mob/clothing/gloves.dmi' | ||
| lefthand_file = 'modular_bandastation/objects/icons/mob/inhands/gloves_lefthand.dmi' | ||
| righthand_file = 'modular_bandastation/objects/icons/mob/inhands/gloves_righthand.dmi' | ||
| icon_state = "forensics" | ||
| clothing_flags = FIBERLESS_GLOVES | ||
|
|
||
| /obj/item/clothing/gloves/examine_tags(mob/user) | ||
| . = ..() | ||
| if(clothing_flags & FIBERLESS_GLOVES) | ||
| .["безволоконная"] = "Не оставляет волокна." |
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
...n/objects/code/clothing/head/soft_caps.dm → ...cts/code/items/clothing/head/soft_caps.dm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.