Commiting SueTheCake's detective things.
-New set of clothes spawning in the closet. -Replacement of revolver by semiauto gun, with update to autolathe recipies.
@@ -35,7 +35,7 @@ var/global/list/autolathe_recipes = list( \
|
|||||||
new /obj/item/weapon/reagent_containers/syringe(), \
|
new /obj/item/weapon/reagent_containers/syringe(), \
|
||||||
new /obj/item/ammo_casing/shotgun/blank(), \
|
new /obj/item/ammo_casing/shotgun/blank(), \
|
||||||
new /obj/item/ammo_casing/shotgun/beanbag(), \
|
new /obj/item/ammo_casing/shotgun/beanbag(), \
|
||||||
new /obj/item/ammo_magazine/c38(), \
|
new /obj/item/ammo_magazine/c45r(), \
|
||||||
new /obj/item/device/taperecorder(), \
|
new /obj/item/device/taperecorder(), \
|
||||||
new /obj/item/device/assembly/igniter(), \
|
new /obj/item/device/assembly/igniter(), \
|
||||||
new /obj/item/device/assembly/signaler(), \
|
new /obj/item/device/assembly/signaler(), \
|
||||||
@@ -57,6 +57,7 @@ var/global/list/autolathe_recipes_hidden = list( \
|
|||||||
new /obj/item/weapon/weldingtool/largetank(), \
|
new /obj/item/weapon/weldingtool/largetank(), \
|
||||||
new /obj/item/weapon/handcuffs(), \
|
new /obj/item/weapon/handcuffs(), \
|
||||||
new /obj/item/ammo_magazine/a357(), \
|
new /obj/item/ammo_magazine/a357(), \
|
||||||
|
new /obj/item/ammo_magazine/c45(), \
|
||||||
new /obj/item/ammo_casing/shotgun(), \
|
new /obj/item/ammo_casing/shotgun(), \
|
||||||
new /obj/item/ammo_casing/shotgun/dart(), \
|
new /obj/item/ammo_casing/shotgun/dart(), \
|
||||||
/* new /obj/item/weapon/shield/riot(), */ \
|
/* new /obj/item/weapon/shield/riot(), */ \
|
||||||
|
|||||||
@@ -247,20 +247,24 @@
|
|||||||
..()
|
..()
|
||||||
sleep(2)
|
sleep(2)
|
||||||
new /obj/item/clothing/under/det(src)
|
new /obj/item/clothing/under/det(src)
|
||||||
|
new /obj/item/clothing/under/det/black(src)
|
||||||
|
new /obj/item/clothing/under/det/slob(src)
|
||||||
new /obj/item/clothing/suit/storage/det_suit(src)
|
new /obj/item/clothing/suit/storage/det_suit(src)
|
||||||
|
new /obj/item/clothing/suit/storage/det_suit/black(src)
|
||||||
new /obj/item/clothing/suit/storage/forensics/blue(src)
|
new /obj/item/clothing/suit/storage/forensics/blue(src)
|
||||||
new /obj/item/clothing/suit/storage/forensics/red(src)
|
new /obj/item/clothing/suit/storage/forensics/red(src)
|
||||||
new /obj/item/clothing/gloves/black(src)
|
new /obj/item/clothing/gloves/black(src)
|
||||||
new /obj/item/clothing/head/det_hat(src)
|
new /obj/item/clothing/head/det_hat(src)
|
||||||
|
new /obj/item/clothing/head/det_hat/black(src)
|
||||||
new /obj/item/clothing/shoes/brown(src)
|
new /obj/item/clothing/shoes/brown(src)
|
||||||
new /obj/item/weapon/storage/box/evidence(src)
|
new /obj/item/weapon/storage/box/evidence(src)
|
||||||
new /obj/item/device/radio/headset/headset_sec(src)
|
new /obj/item/device/radio/headset/headset_sec(src)
|
||||||
new /obj/item/device/detective_scanner(src)
|
new /obj/item/device/detective_scanner(src)
|
||||||
new /obj/item/clothing/suit/armor/det_suit(src)
|
new /obj/item/clothing/suit/armor/det_suit(src)
|
||||||
new /obj/item/ammo_magazine/c38(src)
|
new /obj/item/ammo_magazine/c45r(src)
|
||||||
new /obj/item/ammo_magazine/c38(src)
|
new /obj/item/ammo_magazine/c45r(src)
|
||||||
new /obj/item/taperoll/police(src)
|
new /obj/item/taperoll/police(src)
|
||||||
new /obj/item/weapon/gun/projectile/detective(src)
|
new /obj/item/weapon/gun/projectile/detective/semiauto(src)
|
||||||
new /obj/item/clothing/tie/holster/armpit(src)
|
new /obj/item/clothing/tie/holster/armpit(src)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|||||||
@@ -77,6 +77,9 @@
|
|||||||
allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder)
|
allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder)
|
||||||
armor = list(melee = 50, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
|
armor = list(melee = 50, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
|
||||||
|
|
||||||
|
/obj/item/clothing/suit/storage/det_suit/black
|
||||||
|
icon_state = "detective2"
|
||||||
|
|
||||||
//Forensics
|
//Forensics
|
||||||
/obj/item/clothing/suit/storage/forensics
|
/obj/item/clothing/suit/storage/forensics
|
||||||
name = "jacket"
|
name = "jacket"
|
||||||
|
|||||||
@@ -71,6 +71,22 @@
|
|||||||
flags = FPRINT | TABLEPASS
|
flags = FPRINT | TABLEPASS
|
||||||
siemens_coefficient = 0.9
|
siemens_coefficient = 0.9
|
||||||
|
|
||||||
|
/obj/item/clothing/under/det/black
|
||||||
|
icon_state = "detective2"
|
||||||
|
item_color = "detective2"
|
||||||
|
|
||||||
|
/obj/item/clothing/under/det/slob
|
||||||
|
icon_state = "polsuit"
|
||||||
|
item_color = "polsuit"
|
||||||
|
|
||||||
|
/obj/item/clothing/under/det/slob/verb/rollup()
|
||||||
|
set name = "Roll suit sleevels"
|
||||||
|
set category = "Object"
|
||||||
|
set src in usr
|
||||||
|
item_color = item_color == "polsuit" ? "polsuit_rolled" : "polsuit"
|
||||||
|
if (ishuman(loc))
|
||||||
|
var/mob/living/carbon/human/H = loc
|
||||||
|
H.update_inv_w_uniform(1)
|
||||||
|
|
||||||
/obj/item/clothing/head/det_hat
|
/obj/item/clothing/head/det_hat
|
||||||
name = "hat"
|
name = "hat"
|
||||||
@@ -80,6 +96,10 @@
|
|||||||
armor = list(melee = 50, bullet = 5, laser = 25,energy = 10, bomb = 0, bio = 0, rad = 0)
|
armor = list(melee = 50, bullet = 5, laser = 25,energy = 10, bomb = 0, bio = 0, rad = 0)
|
||||||
siemens_coefficient = 0.9
|
siemens_coefficient = 0.9
|
||||||
|
|
||||||
|
/obj/item/clothing/head/det_hat/black
|
||||||
|
icon_state = "detective2"
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Head of Security
|
* Head of Security
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -14,6 +14,25 @@
|
|||||||
multiple_sprites = 1
|
multiple_sprites = 1
|
||||||
|
|
||||||
|
|
||||||
|
/obj/item/ammo_magazine/c45
|
||||||
|
name = "magazine (.45)"
|
||||||
|
icon_state = "45"
|
||||||
|
ammo_type = "/obj/item/ammo_casing/c45"
|
||||||
|
max_ammo = 7
|
||||||
|
multiple_sprites = 1
|
||||||
|
|
||||||
|
/obj/item/ammo_magazine/c45/empty
|
||||||
|
max_ammo = 0
|
||||||
|
|
||||||
|
/obj/item/ammo_magazine/c45r
|
||||||
|
name = "magazine (.45 rubber)"
|
||||||
|
icon_state = "45"
|
||||||
|
ammo_type = "/obj/item/ammo_casing/c45r"
|
||||||
|
max_ammo = 7
|
||||||
|
multiple_sprites = 1
|
||||||
|
|
||||||
|
/obj/item/ammo_magazine/c45r/empty
|
||||||
|
max_ammo = 0
|
||||||
|
|
||||||
/obj/item/ammo_magazine/a418
|
/obj/item/ammo_magazine/a418
|
||||||
name = "ammo box (.418)"
|
name = "ammo box (.418)"
|
||||||
|
|||||||
@@ -43,6 +43,10 @@
|
|||||||
caliber = ".45"
|
caliber = ".45"
|
||||||
projectile_type = "/obj/item/projectile/bullet/midbullet"
|
projectile_type = "/obj/item/projectile/bullet/midbullet"
|
||||||
|
|
||||||
|
/obj/item/ammo_casing/c45r
|
||||||
|
desc = "A .45 rubber bullet casing."
|
||||||
|
caliber = ".45"
|
||||||
|
projectile_type = "/obj/item/projectile/bullet/weakbullet"
|
||||||
|
|
||||||
/obj/item/ammo_casing/a12mm
|
/obj/item/ammo_casing/a12mm
|
||||||
desc = "A 12mm bullet casing."
|
desc = "A 12mm bullet casing."
|
||||||
|
|||||||
@@ -70,6 +70,26 @@
|
|||||||
user << "<span class='warning'>You remove the modifications on [src]! Now it will fire .38 rounds.</span>"
|
user << "<span class='warning'>You remove the modifications on [src]! Now it will fire .38 rounds.</span>"
|
||||||
|
|
||||||
|
|
||||||
|
/obj/item/weapon/gun/projectile/detective/semiauto
|
||||||
|
desc = "A cheap Martian knock-off of a Colt M1911. Uses less-than-lethal .45 rounds."
|
||||||
|
name = "\improper Colt M1911"
|
||||||
|
icon_state = "colt"
|
||||||
|
max_shells = 7
|
||||||
|
caliber = ".45"
|
||||||
|
ammo_type = "/obj/item/ammo_casing/c45r"
|
||||||
|
load_method = 2
|
||||||
|
|
||||||
|
/obj/item/weapon/gun/projectile/detective/semiauto/New()
|
||||||
|
..()
|
||||||
|
empty_mag = new /obj/item/ammo_magazine/c45r/empty(src)
|
||||||
|
return
|
||||||
|
|
||||||
|
/obj/item/weapon/gun/projectile/detective/semiauto/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag)
|
||||||
|
..()
|
||||||
|
if(!loaded.len && empty_mag)
|
||||||
|
empty_mag.loc = get_turf(src.loc)
|
||||||
|
empty_mag = null
|
||||||
|
return
|
||||||
|
|
||||||
|
|
||||||
/obj/item/weapon/gun/projectile/mateba
|
/obj/item/weapon/gun/projectile/mateba
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 117 KiB After Width: | Height: | Size: 118 KiB |
|
Before Width: | Height: | Size: 231 KiB After Width: | Height: | Size: 232 KiB |
|
Before Width: | Height: | Size: 189 KiB After Width: | Height: | Size: 190 KiB |
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 4.1 KiB |
|
Before Width: | Height: | Size: 57 KiB After Width: | Height: | Size: 57 KiB |
|
Before Width: | Height: | Size: 78 KiB After Width: | Height: | Size: 78 KiB |
|
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 50 KiB |
|
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 39 KiB |