Update skills to master (#9198)

* Update atoms_religify.dm (#8971)

* removing mutantrace (#8930)

Co-authored-by: KIBORG04 <bossmira4@gmail.com>

* Quality Quality of Life Quality Updates (#8962)

* fix (#8951)

Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>

* properly applying mutations, giving them a cool beard (#8972)

* fixes vox, uniforms, rolling down (#8979)

* Logout spawners (#8931)

* first version

* check roles

* add borer to living spawner

* logout_reason

* logout and ghost timeouts

* better job & remove wait from robot

* refactor and add living spawner

* better self_qdel

* religion

* add roles

* podman self_spawners

* remove ghost comsig and diona spawner

* transfer LOGOUT_SWAP both characters

* fixes

* remove id's

* add comsig_died and timer check

* fix

* check for dead

* remove id's

* eof

* forgot unregister

* propper component deleting

* unrest mobs

* renaming

* woops

* better user logout catch

* comment

* signal arg and ismob

* as Киборг wish

* woops

* remove var/callback

Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>

* Start landmark renaming (#8949)

* first

* our landmarks

* useless landmark

* plane and layer (and fix order of files)

* better landmarks

* update landmarks

* fix landmarks

* fix t

* fix tabs

* add calls

Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>

* удаляет рандомные пушки и неиспользуемые спрайты пушек (#9003)

* 1

* Update gun.dmi

* 2

Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>

* Порт гуи для изменения партиклов онлайн (#8863)

* removing rig spritesheets from unathinathi (#9034)

* Чиню мартышек, опять (#9021)

* add min

* better checks

* one min

* as you wish

* float to int?

Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>

* fix_env_path (#9019)

Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>

* fix survivalcapsule (#9018)

* fix

* add min

* better checks

* outdoors

* Revert "add min"

This reverts commit 0c125b6.

* Revert "better checks"

This reverts commit d51faf9.

Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>

* Silly emote fixes (#9005)

* no emoting whil dead

* no sound when miming

* no emotes when dead

* okay

* okay Kiborg

* better lane positioning

pomogite

* Fixes #8995 (#8996)

* caps fixed

* better fix

* little refactor

* singularity doesn't eat telekinetically, TK item use consistency (#9004)

* singularity doesn't eat telekinetically, item use consistency

* don't telekinetically open doors you have access to

* actually windows are okay too

* removing attack_self_tk

* huh

* resprite retrolaser (#9037)

* resprite

* 1

* Update pit.dm

Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>

* dionaeaea replication (#8973)

* dionaeaea replication

* gestalt alignment

* no intent check required

* fixes

* gripper and suture (#9051)

* emotes produce sound (#9054)

* no empty qualities (#9057)

* no empty qualities

* qdeling quality not used

* Воксы-нюковцы появляются в combat boots (#9067)

## Описание изменений
Добавил замену combat boots на mangled combat boots у вокса
## Почему и что этот ПР улучшит
Вокс-нюкер раньше появлялся без ботинок
## Авторство
я
## Чеинжлог
bagfix: вокс-нюкер появляется в mangled combat boots

Co-authored-by: Sakuya-Izayoi <30875884+Sakuya-Izayoi@users.noreply.github.com>

* апдейт лестниц (#9043)

* 1

* Update ladders.dm

* Update ladders.dm

* ну пофиг на грабы от делеев хоть кайфуйте

* фикс багов агента прослушки (#9040)

* 1

* Update areas.dm

Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>

* remove some old shit (#9082)

* fixes war face (#9065)

Co-authored-by: Sakuya-Izayoi <30875884+Sakuya-Izayoi@users.noreply.github.com>
Co-authored-by: KIBORG04 <bossmira4@gmail.com>

* Fix event maploader (#9086)

* remove useless proc and fix bounds init

* list*

* Выпилил показывание ксенорасы из экзамайна (#9081)

* Update examine.dm

* quality

* age and quirks vision

* balance issue

Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>

* Перевод законов ИИ (#7013)

Co-authored-by: Alexander V. <volas@ya.ru>
Co-authored-by: PervertGenius <chizhovnikita2000@gmail.com>
Co-authored-by: Darth Sidious <andrgysev02@mail.ru>
Co-authored-by: KIBORG04 <bossmira4@gmail.com>

* Мерж конфликтер работает только в репозитории тау киты (#9091)

* Update conflicts.yml (#9092)

* lazy guard tweak (#9097)

* Update cult_structures.dm (#9096)

Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>

* Salarian -> Salackyi (#9099)

* трупы на дереликтах больше не имеют фулаксеса (#9093)

Co-authored-by: KIBORG04 <bossmira4@gmail.com>

* Еще один алерт для борга (#9027)

Co-authored-by: KIBORG04 <bossmira4@gmail.com>

* Reafactor breath (#9061)

* first

* is_ fixes

* handle breath temp and fix

* fix alerts

* ian and mood events

* fix

* client check

* revert switch

* fix breath temp

* fixes

* remove alerts

* gasses for carbons

* move species gas types

* add handle_suffocating

* move suffocation

* fixes

* remove human handle_breath

* better smoke handling (a bit)

* better get_breath_from_internal

* stabilize_body_temperature and better breath

* better handle_suffocating

* better suiciding

* fixes

* remove

* update internals

* remove type check

* rename a bit

* fix

* add brain and monkey to alert handling

* fix a bit

* remove is_handle_smoke

* remove useless return

* Fix env mood events

Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>

Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>

* Изменение винрейта культа с 67% до 40% (#9094)

* buff

* no abuse

* fixes by review

Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>

* point to (#9050)

Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>

* fullness_lose_on_execute -> cost, fullness -> points (#9088)

* Фикс отображения разных форм детектива (#9108)

* Воксы-нюковцы появляются в combat boots

## Описание изменений
Добавил замену combat boots на mangled combat boots у вокса
## Почему и что этот ПР улучшит
Вокс-нюкер раньше появлялся без ботинок
## Авторство
я
## Чеинжлог
bagfix: вокс-нюкер появляется в mangled combat boots

* Update security.dm

* Update uniform_fat.dmi

+ форма max

* Apply suggestions from code review

Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>

Co-authored-by: Sakuya-Izayoi <30875884+Sakuya-Izayoi@users.noreply.github.com>
Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>

* Update ert.dm (#9120)

* Локализация тюрфов и ЕРТ (#6930)

Co-authored-by: Zickusable <76683966+Zickusable@users.noreply.github.com>
Co-authored-by: PervertGenius <chizhovnikita2000@gmail.com>
Co-authored-by: Alexander V. <volas@ya.ru>
Co-authored-by: TechCat <378937+TechCatOther@users.noreply.github.com>
Co-authored-by: Sakuya-Izayoi <30875884+Sakuya-Izayoi@users.noreply.github.com>
Co-authored-by: KIBORG04 <bossmira4@gmail.com>

* Переводы стенок и багфикс (#7936)

Co-authored-by: TechCat <378937+TechCatOther@users.noreply.github.com>
Co-authored-by: Alexander V. <volas@ya.ru>

* Update TRANSLATION.md

* Update TRANSLATION.md

* Мёртвые не зреют, не гниют, Не умеют, не живут (#9118)

* инициализация

* Людук придумал штуку, я рыдал всю ночь. Ничего не понятно, не очень и интересно

* Обновка

* э

* забыл

* починено

* тадаа

* Update organ_internal.dm

* тварь работай

* забыл

* убрал лишнее

* давай дримчекер, давай, чего ты ждёшь?!

* рази-двази

* сет

* бейз

* фикс

* Update code/game/machinery/life_assist.dm

Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>

* Update code/modules/organs/organ_internal.dm

Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>

* Update code/modules/organs/organ_internal.dm

Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>

* Update code/modules/organs/organ_internal.dm

Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>

* до а не после

* Update life.dm

* Update life.dm

* обновка

* нижняя граница метаболизма

* Update code/modules/mob/living/carbon/human/life.dm

Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>

* Update code/modules/organs/organ_internal.dm

Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>

* убрал смерть органов от голода

* Update code/modules/mob/living/carbon/carbon.dm

* Update code/modules/mob/living/carbon/carbon_defines.dm

* фиксики

* Update code/modules/organs/organ_external.dm

Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>

* Update code/modules/organs/organ_external.dm

Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>

* Update code/modules/organs/external/flesh.dm

Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>

* fixes cargo cap, fixes washed caps after flip (#9117)

* fixes cargo cap, fixes washed caps after flip

* DRY

* hm

* Объединение Rest и Crawl (#8998)

* Rest to crawl (14)

* Update living.dm

* Crawl_patch (15)

* Crawl_patch-2 (16)

* Update pbag.dm

* Setters for Crawl (18)

* added_setter

* carbon_setter

* set_op_table

* set_pbag

* Update pbag.dm

* del_adjust_crawl

* Update xenomorph.dm

* Patch_Crawl_setters.dm (19)

* Update carbon.dm

* kalazus_change

* desc-update

* observer-update

* Bulling (20)

* Update code/modules/mob/living/silicon/robot/life.dm

Co-authored-by: KIBORG04 <bossmira4@gmail.com>

* chair_rest

* kalazus-patch__forcemove-fix (26)

* Patch_Ian (28)

* Ian_patch (29)

* Patch_resting (30)

* construct_no_grief

* simple-mob_no_gansta 

* Update constructs.dm

* Update simple_animal.dm

* monke_crawl_without_client

Co-authored-by: KIBORG04 <bossmira4@gmail.com>
Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>

* (s)exploit #70 (#9131)

* no

* books and length

* no

* no side effects (#9136)

* Реворк ритуала гомункулов (#9102)

* buff

* no abuse

* fixes by review

* so hard

* totally rework of rite

* pedestal rites fix

* remove rand_tail flag

* ренейминг дефайна и удаление костыля

Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>

* sexploit #69 (#9122)

* Спавны, перформанс, чтооо??? (#9087)

* fix (#9155)

* Gestalt-aligned seeds don't overgrow (#9150)

Co-authored-by: KIBORG04 <bossmira4@gmail.com>

* Крупные и не очень изменения в вещичках трейторов и нюки (#9154)

Co-authored-by: KIBORG04 <bossmira4@gmail.com>

* Фикс дюпа тел конструктов (#9147)

* Update soulstone.dm

* soulstone ql

* Update species.dm (#9148)

* Фикс спрайтов у магазинов для стечкина (#9172)

* Update magazines.dm

* Update ammo.dmi

* Update ammo.dmi

* удаляет customitems/item_defines.dm и custom_items.dmi (#9175)

* удаляет customitems/item_defines.dm и custom_items.dmi

* 2

* 3

* 4

* Update taucetistation.dme

* Update glass.dm

* Update miscellaneous.dm

* Update code/game/objects/random/random_misc.dm

Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>

* Update glass.dm

Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>

* Фикс разноцветных хвостов воксов (#9162)

* Багфикс открывания заваренной пожарной створки (#9158)

* fix

* fix2

Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>

* More telepathy (#8980)

* new telepathy

* giving this to the genetics guy

* getting this game stuff to actually compile

* hearing things

* sleep

* span fixes

pomogite

* beautiful defines

* god forgive me

* mk

* a bunch of fixes

* на самом деле это кольтнерф 😔 (#9105)

Co-authored-by: Sakuya-Izayoi <30875884+Sakuya-Izayoi@users.noreply.github.com>

* nerf (#9169)

Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>

* Фикс терминаторов с руками из блюспейса (#9191)

* f

* emmm

* респрайт обопа (#9184)

* herewego

* desc

* Update miscellaneous.dm

* Update boots.dm

* Update helmet.dm

* Delete IDPDstuff.dmi

* smol

* Update armor.dm

* Update outfit.dm

Co-authored-by: KIBORG04 <bossmira4@gmail.com>
Co-authored-by: LudwigVonChesterfield <17705613+LudwigVonChesterfield@users.noreply.github.com>
Co-authored-by: kalazus <30507262+kalazus@users.noreply.github.com>
Co-authored-by: AndroBetel <44546836+AndroBetel@users.noreply.github.com>
Co-authored-by: Zickusable <76683966+Zickusable@users.noreply.github.com>
Co-authored-by: INwirstD <95256997+INwirstD@users.noreply.github.com>
Co-authored-by: Sakuya-Izayoi <30875884+Sakuya-Izayoi@users.noreply.github.com>
Co-authored-by: Fenriros <81817229+Fenriros@users.noreply.github.com>
Co-authored-by: Alexander V. <volas@ya.ru>
Co-authored-by: PervertGenius <chizhovnikita2000@gmail.com>
Co-authored-by: Darth Sidious <andrgysev02@mail.ru>
Co-authored-by: 4310V343k <56449763+4310V343k@users.noreply.github.com>
Co-authored-by: TechCat <378937+TechCatOther@users.noreply.github.com>
Co-authored-by: Deahaka <96499407+Deahaka@users.noreply.github.com>
Co-authored-by: simb11 <84613249+simb11@users.noreply.github.com>

code/datums/mind.dm

@@ -226,7 +226,6 @@
 	popup.set_content(out)
 	popup.open()
 
-
 /datum/mind/Topic(href, href_list)
 	if(!check_rights(R_ADMIN))
 		return

code/game/gamemodes/modes_gameplays/families/outfit.dm

@@ -1,30 +1,19 @@
-/obj/item/weapon/storage/belt/security/cops/atom_init()
-	. = ..()
-	new /obj/item/weapon/melee/baton(src)
-	for (var/i in 1 to 2)
-		new /obj/item/weapon/grenade/flashbang(src)
-	for (var/i in 1 to 3)
-		new /obj/item/weapon/handcuffs(src)
-	new /obj/item/weapon/shield/riot/tele(src)
+/obj/item/weapon/storage/belt/security/cops
+	startswith = list(/obj/item/weapon/melee/baton = 1, /obj/item/weapon/grenade/flashbang = 2, /obj/item/weapon/handcuffs = 3, /obj/item/weapon/shield/riot/tele = 1)
 
-/obj/item/weapon/storage/belt/security/tactical/cops/atom_init()
-	. = ..()
-	new /obj/item/weapon/melee/baton(src)
-	for (var/i in 1 to 2)
-		new /obj/item/weapon/grenade/flashbang(src)
-	for (var/i in 1 to 3)
-		new /obj/item/weapon/handcuffs(src)
-		new /obj/item/ammo_box/magazine/m556(src)
+/obj/item/weapon/storage/belt/security/tactical/cops
+	startswith = list(/obj/item/weapon/melee/baton = 1, /obj/item/weapon/grenade/flashbang = 2, /obj/item/weapon/handcuffs = 3, /obj/item/ammo_box/magazine/m556 = 3)
 
 /datum/outfit/families_police/beatcop
 	name = "Families: Офицер"
 
 	uniform = /obj/item/clothing/under/rank/security/beatcop
 	back = /obj/item/weapon/storage/backpack/satchel/sec/cops
-	shoes = /obj/item/clothing/shoes/boots/swat
+	shoes = /obj/item/clothing/shoes/boots/police
 	glasses = /obj/item/clothing/glasses/sunglasses
 	l_ear = /obj/item/device/radio/headset/headset_sec/alt
 	head = /obj/item/clothing/head/spacepolice
+	mask = /obj/item/clothing/mask/gas/sechailer/police
 	belt = /obj/item/weapon/storage/belt/security/cops
 	r_pocket = /obj/item/device/flashlight
 	l_pocket = /obj/item/device/flash
@@ -45,8 +34,8 @@
 
 /datum/outfit/families_police/beatcop/armored
 	name = "Families: Вооруженный Офицер"
-	suit = /obj/item/clothing/suit/armor/vest/security
-	head = /obj/item/clothing/head/helmet
+	suit = /obj/item/clothing/suit/storage/flak/police
+	head = /obj/item/clothing/head/helmet/police
 	suit_store = /obj/item/weapon/gun/projectile/shotgun/dungeon
 	backpack_contents = list(
 		/obj/item/weapon/storage/box/teargas = 1,
@@ -57,10 +46,10 @@
 
 /datum/outfit/families_police/beatcop/swat
 	name = "Families: Боец Тактической Группы"
-	suit = /obj/item/clothing/suit/armor/vest/fullbody
-	head = /obj/item/clothing/head/helmet
-	mask = /obj/item/clothing/mask/gas/sechailer
-	gloves = /obj/item/clothing/gloves/combat
+	suit = /obj/item/clothing/suit/storage/flak/police/fullbody
+	head = /obj/item/clothing/head/helmet/police/heavy
+	mask = /obj/item/clothing/mask/gas/sechailer/police
+	gloves = /obj/item/clothing/gloves/combat/police
 	suit_store = /obj/item/weapon/gun/projectile/shotgun/combat
 	backpack_contents = list(
 		/obj/item/weapon/storage/box/handcuffs = 1,
@@ -72,11 +61,10 @@
 
 /datum/outfit/families_police/beatcop/fbi
 	name = "Families: Инспектор"
-	suit = /obj/item/clothing/suit/armor/laserproof
-	back = /obj/item/weapon/storage/backpack/satchel
-	head = /obj/item/clothing/head/beret/spacepolice
+	suit = /obj/item/clothing/suit/armor/laserproof/police
+	head = /obj/item/clothing/head/helmet/laserproof/police
 	glasses = /obj/item/clothing/glasses/sunglasses/big
-	gloves = /obj/item/clothing/gloves/white
+	gloves = /obj/item/clothing/gloves/combat/police
 	suit_store = /obj/item/weapon/gun/projectile/automatic
 	backpack_contents = list(
 		/obj/item/weapon/storage/box/handcuffs = 1,
@@ -86,12 +74,11 @@
 
 /datum/outfit/families_police/beatcop/military
 	name = "Families: Боец ВСНТ"
-	uniform = /obj/item/clothing/under/tactical/marinad
-	suit = /obj/item/clothing/suit/marinad
-	head = /obj/item/clothing/head/helmet/tactical/marinad
+	suit = /obj/item/clothing/suit/storage/flak/police/fullbody/heavy
+	head = /obj/item/clothing/head/helmet/police/elite
 	belt = /obj/item/weapon/storage/belt/security/tactical/cops
-	gloves = /obj/item/clothing/gloves/security/marinad
-	back = /obj/item/weapon/storage/backpack/dufflebag/marinad
+	gloves = /obj/item/clothing/gloves/combat/police
+	back = /obj/item/weapon/storage/backpack/satchel/sec/cops
 	backpack_contents = list(
 		/obj/item/weapon/storage/box/handcuffs = 1,
 		/obj/item/weapon/storage/box/teargas = 1,

code/modules/clothing/gloves/miscellaneous.dm

@@ -132,3 +132,9 @@
 	desc = "The left one of a pair of black gloves. Wonder where the other one went..."
 	icon_state = "left_glove"
 	item_state = "left_glove"
+
+/obj/item/clothing/gloves/combat/police
+	desc = "Fist of the Law."
+	name = "police gloves"
+	icon_state = "police_gloves"
+	item_state = "police_gloves"

code/modules/clothing/head/helmet.dm

@@ -225,3 +225,29 @@
 	siemens_coefficient = 1.2
 	flags = HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
+
+/obj/item/clothing/head/helmet/police
+	name = "police helmet"
+	desc = "Latest fashion of law enforcement organizations. It's big. Like, really big."
+	icon_state = "police_helmet"
+	flags = HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
+
+/obj/item/clothing/head/helmet/police/heavy
+	name = "heavy police helmet"
+	desc = "Latest fashion of law enforcement organizations. It's big. Like, really big. Golden marks on this helmet denote the higher rank of it's wearer."
+	icon_state = "police_helmet_heavy"
+	armor = list(melee = 55, bullet = 50, laser = 45,energy = 25, bomb = 35, bio = 0, rad = 0)
+
+/obj/item/clothing/head/helmet/laserproof/police
+	name = "inspector helmet"
+	desc = "An experimental helmet that is able to reflect laser projectiles via psionic manipulations with wearer's mind or something. It's also slightly bigger than other police helmets, since big brain and all."
+	icon_state = "police_helmet_inspector"
+	armor = list(melee = 35, bullet = 35, laser = 65,energy = 75, bomb = 0, bio = 0, rad = 0)
+	siemens_coefficient = 0
+
+/obj/item/clothing/head/helmet/police/elite
+	name = "elite police helmet"
+	desc = "This is a heavily armored police helmet. The most blockiest of them all."
+	icon_state = "police_helmet_elite"
+	armor = list(melee = 60, bullet = 65, laser = 55, energy = 60, bomb = 40, bio = 0, rad = 0)

code/modules/clothing/masks/gasmask.dm

@@ -176,6 +176,12 @@
 		playsound(src, phrase_sound, VOL_EFFECTS_MASTER, vary = FALSE)
 		cooldown = world.time
 
+/obj/item/clothing/mask/gas/sechailer/police
+	name = "police respirator"
+	desc = "A standard issue police respirator with integrated 'Compli-o-nator 3000' device, plays over a dozen pre-recorded compliance phrases designed to get scumbags to stand still whilst you detain them. Do not tamper with the device."
+	icon_state = "police_mask"
+	flags = MASKCOVERSMOUTH | BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
+
 //Plague Dr suit can be found in clothing/suits/bio.dm
 /obj/item/clothing/mask/gas/plaguedoctor
 	name = "plague doctor mask"

code/modules/clothing/shoes/boots.dm

@@ -96,3 +96,10 @@
 	heat_protection = LEGS
 	max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE
 	species_restricted = null
+
+/obj/item/clothing/shoes/boots/police
+	desc = "Nanotrasen-issue police combat boots for combat scenarios or combat situations. All combat, all the time."
+	icon_state = "police_boots"
+	item_state = "wjboots"
+	siemens_coefficient = 0.7
+	clipped_status = NO_CLIPPING

code/modules/clothing/suits/armor.dm

@@ -57,6 +57,25 @@
 	pockets = new/obj/item/weapon/storage/internal(src)
 	pockets.set_slots(slots = 4, slot_size = SIZE_TINY)
 
+/obj/item/clothing/suit/storage/flak/police
+	name = "police armor"
+	desc = "An armored vest that protects against some damage. This one has four pockets for storage and a custom paintjob in colors of OCD."
+	icon_state = "police_armor"
+
+/obj/item/clothing/suit/storage/flak/police/fullbody
+	name = "police fullbody armor"
+	desc = "A set of armor covering the entire body. This variant is used by OCD and is painted accordingly."
+	icon_state = "police_armor_fullbody"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
+	pierce_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
+
+/obj/item/clothing/suit/storage/flak/police/fullbody/heavy
+	name = "heavy fullbody armor"
+	desc = "A set of armor used by special weapons and tactics units of OCD. Justice will be served."
+	icon_state = "police_armor_heavy"
+	slowdown = 0.2
+	armor = list(melee = 60, bullet = 65, laser = 55, energy = 60, bomb = 40, bio = 0, rad = 0)
+
 /obj/item/clothing/suit/marinad
 	name = "marine armor"
 	desc = "This thing will protect you from any angry flora or fauna."
@@ -158,6 +177,12 @@
 	if (prob(hit_reflect_chance))
 		return 1
 
+/obj/item/clothing/suit/armor/laserproof/police
+	name = "police ablative armor"
+	desc = "An experimental model of ablative armor issued in limited numbers to special units of OCD. This set of armor protects not only against lasers but is also sturdy enough to withstand other damage types."
+	icon_state = "police_armor_inspector"
+	armor = list(melee = 35, bullet = 35, laser = 65, energy = 75, bomb = 0, bio = 0, rad = 0)
+
 /obj/item/clothing/suit/armor/swat
 	name = "swat suit"
 	desc = "A heavily armored suit that protects against moderate damage. Used in special operations."

code/modules/clothing/under/miscellaneous.dm

@@ -726,18 +726,9 @@
 	item_state = "DutchUniform"
 
 /obj/item/clothing/head/spacepolice
-	name = "NanoTrasen cap"
+	name = "police cap"
 	desc = "A blue cap for patrolling the daily beat."
-	icon_state = "policecap_families"
-
-/obj/item/clothing/head/beret/spacepolice
-	name = "NanoTrasen beret"
-	desc = "An armored blue beret belonging to some low ranking officer in space police forces."
-	icon_state = "beret_cops"
-	armor = list(melee = 80, bullet = 60, laser = 50,energy = 10, bomb = 25, bio = 10, rad = 0)
-	body_parts_covered = 1
-	pierce_protection = HEAD
-	flags = HEADCOVERSEYES
+	icon_state = "police_cap"
 
 /obj/item/clothing/under/henchmen
 	name = "henchmen jumpsuit"