Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
501 changes: 253 additions & 248 deletions _maps/map_files/Vampire/special_fran/special_francisco.dmm

Large diffs are not rendered by default.

42 changes: 42 additions & 0 deletions modular_zapoc/modules/police_equipment/code/riot_gear.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
//Police Riot Gear
/obj/item/clothing/suit/vampire/vest/police/riot
name = "riot vest"
icon_state = "riotvest"
desc = "Lightweight riot vest with SFPD markings, tailored for riot control."
armor_type = /datum/armor/riot_vest
icon = 'modular_darkpack/modules/police_equipment/icons/clothing.dmi'

Check failure on line 7 in modular_zapoc/modules/police_equipment/code/riot_gear.dm

View workflow job for this annotation

GitHub Actions / Run Linters / linters

OD0404: Cannot find file 'modular_darkpack/modules/police_equipment/icons/clothing.dmi'
worn_icon = 'modular_darkpack/modules/police_equipment/icons/worn.dmi'

Check failure on line 8 in modular_zapoc/modules/police_equipment/code/riot_gear.dm

View workflow job for this annotation

GitHub Actions / Run Linters / linters

OD0404: Cannot find file 'modular_darkpack/modules/police_equipment/icons/worn.dmi'
ONFLOOR_ICON_HELPER('modular_darkpack/modules/police_equipment/icons/clothing_onfloor.dmi')

Check failure on line 9 in modular_zapoc/modules/police_equipment/code/riot_gear.dm

View workflow job for this annotation

GitHub Actions / Run Linters / linters

OD0404: Cannot find file 'modular_darkpack/modules/police_equipment/icons/clothing_onfloor.dmi'

Check failure on line 9 in modular_zapoc/modules/police_equipment/code/riot_gear.dm

View workflow job for this annotation

GitHub Actions / Run Linters / linters

OD0404: Cannot find file 'modular_darkpack/modules/police_equipment/icons/clothing_onfloor.dmi'

/datum/armor/riot_vest
melee = 80
bullet = 40
laser = 10
energy = 10
bomb = 45
fire = 45
acid = 10
wound = 25

/obj/item/clothing/head/vampire/helmet/riot
name = "riot helmet"
desc = "A riot helmet. Provides good protection against blunt force, but less so against projectiles."
icon_state = "riothelm"
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR
armor_type = /datum/armor/riot_helmet
icon = 'modular_darkpack/modules/police_equipment/icons/clothing.dmi'

Check failure on line 27 in modular_zapoc/modules/police_equipment/code/riot_gear.dm

View workflow job for this annotation

GitHub Actions / Run Linters / linters

OD0404: Cannot find file 'modular_darkpack/modules/police_equipment/icons/clothing.dmi'

Check failure on line 27 in modular_zapoc/modules/police_equipment/code/riot_gear.dm

View workflow job for this annotation

GitHub Actions / Run Linters / linters

OD0404: Cannot find file 'modular_darkpack/modules/police_equipment/icons/clothing.dmi'
worn_icon = 'modular_darkpack/modules/police_equipment/icons/worn.dmi'

Check failure on line 28 in modular_zapoc/modules/police_equipment/code/riot_gear.dm

View workflow job for this annotation

GitHub Actions / Run Linters / linters

OD0404: Cannot find file 'modular_darkpack/modules/police_equipment/icons/worn.dmi'

Check failure on line 28 in modular_zapoc/modules/police_equipment/code/riot_gear.dm

View workflow job for this annotation

GitHub Actions / Run Linters / linters

OD0404: Cannot find file 'modular_darkpack/modules/police_equipment/icons/worn.dmi'
ONFLOOR_ICON_HELPER('modular_darkpack/modules/police_equipment/icons/clothing_onfloor.dmi')

Check failure on line 29 in modular_zapoc/modules/police_equipment/code/riot_gear.dm

View workflow job for this annotation

GitHub Actions / Run Linters / linters

OD0404: Cannot find file 'modular_darkpack/modules/police_equipment/icons/clothing_onfloor.dmi'

Check failure on line 29 in modular_zapoc/modules/police_equipment/code/riot_gear.dm

View workflow job for this annotation

GitHub Actions / Run Linters / linters

OD0404: Cannot find file 'modular_darkpack/modules/police_equipment/icons/clothing_onfloor.dmi'
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF
masquerade_violating = TRUE
custom_price = 75

/datum/armor/riot_helmet
melee = 65
bullet = 25
laser = 25
energy = 25
bomb = 30
fire = 20
acid = 40
wound = 25
29 changes: 29 additions & 0 deletions modular_zapoc/modules/police_equipment/code/vendor.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
//Utilities Vendor - Less bang orientated, more RP
/obj/structure/retail/police_utilities
product_types = list(
/obj/item/clothing/under/vampire/police,
/obj/item/clothing/under/vampire/police/long,
/obj/item/clothing/under/vampire/police/turtleneck,
/obj/item/clothing/under/vampire/police/pants,
/obj/item/clothing/under/vampire/police/utility,
/obj/item/clothing/head/vampire/police,
/obj/item/clothing/suit/vampire/coat/police,
/obj/item/storage/belt/holster/detective/darkpack,
/obj/item/storage/belt/security/police,
/obj/item/camera/detective,
/obj/item/taperecorder,
/obj/item/toy/crayon/white,
/obj/item/storage/box/evidence,
/obj/item/flashlight/seclite,
/obj/item/detective_scanner/darkpack,
/obj/item/storage/box/bodybags,
)

products_list = list(
new /datum/data/vending_product("binoculars", /obj/item/binoculars, 20),
)

/obj/structure/retail/police_utilities/can_shop(mob/user)
var/datum/job/vampire/assigned_role = user.mind?.assigned_role
if(assigned_role && (/datum/job_department/police in assigned_role.departments_list))
return TRUE
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
29 changes: 29 additions & 0 deletions modular_zapoc/modules/police_equipment/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
https://github.com/DarkPack13/SecondCity/pull/166

## \<Battering Ram>

Module ID: police_equipment

### Description:

This module adds riot armour alongside police utilities vendor.

### TG Proc/File Changes:

- N/A

### Modular Overrides:

- N/A

### Defines:

- N/A

### Included files that are not contained in this module:

- N/A

### Credits:

CactusMouth
2 changes: 2 additions & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -8373,6 +8373,8 @@
#include "modular_zapoc\modules\mapping\code\modular_rooms.dm"
#include "modular_zapoc\modules\mapping\code\transfer_zones.dm"
#include "modular_zapoc\modules\mobs\code\cockroach.dm"
#include "modular_zapoc\modules\police_equipment\code\riot_gear.dm"
#include "modular_zapoc\modules\police_equipment\code\vendor.dm"
#include "modular_zapoc\modules\smites\code\crystal.dm"
#include "modular_zapoc\modules\weapons\code\bowie_knife.dm"
#include "modular_zapoc\modules\weapons\code\waraxe.dm"
Expand Down
Loading