mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 10:21:11 +00:00
Fixed IAA being busted on the HoP terminal and secHUDs
Added promised biohazard protection to medical scrubs Added 12mm ammobox, empty 9 and 12mm magazines to protolathe Added secHUD icons for mechanics, paramedics, IAA
This commit is contained in:
@@ -97,7 +97,7 @@ var/list/civilian_positions = list(
|
||||
"Quartermaster",
|
||||
"Cargo Technician",
|
||||
"Shaft Miner",
|
||||
"Lawyer",
|
||||
"Internal Affairs Agent",
|
||||
"Chaplain",
|
||||
"Assistant"
|
||||
)
|
||||
|
||||
@@ -168,6 +168,8 @@
|
||||
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in baby blue."
|
||||
icon_state = "scrubsblue"
|
||||
_color = "scrubsblue"
|
||||
permeability_coefficient = 0.50
|
||||
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
|
||||
flags = FPRINT | ONESIZEFITSALL
|
||||
species_fit = list("Vox")
|
||||
|
||||
@@ -176,6 +178,8 @@
|
||||
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in dark green."
|
||||
icon_state = "scrubsgreen"
|
||||
_color = "scrubsgreen"
|
||||
permeability_coefficient = 0.50
|
||||
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
|
||||
flags = FPRINT | ONESIZEFITSALL
|
||||
species_fit = list("Vox")
|
||||
|
||||
@@ -184,6 +188,8 @@
|
||||
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in deep purple."
|
||||
icon_state = "scrubspurple"
|
||||
_color = "scrubspurple"
|
||||
permeability_coefficient = 0.50
|
||||
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
|
||||
flags = FPRINT | ONESIZEFITSALL
|
||||
species_fit = list("Vox")
|
||||
|
||||
|
||||
@@ -42,6 +42,13 @@
|
||||
ammo_type = "/obj/item/ammo_casing/c9mm"
|
||||
max_ammo = 30
|
||||
|
||||
/obj/item/ammo_storage/box/c12mm
|
||||
name = "ammo box (12mm)"
|
||||
icon_state = "9mm"
|
||||
origin_tech = "combat=2"
|
||||
ammo_type = "/obj/item/ammo_casing/a12mm"
|
||||
max_ammo = 30
|
||||
|
||||
/obj/item/ammo_storage/box/c45
|
||||
name = "ammo box (.45)"
|
||||
icon_state = "9mm"
|
||||
|
||||
@@ -39,6 +39,9 @@
|
||||
sprite_modulo = 3
|
||||
multiple_sprites = 1
|
||||
|
||||
/obj/item/ammo_storage/magazine/smg9mm/empty
|
||||
starting_ammo = 0
|
||||
|
||||
/obj/item/ammo_storage/magazine/a50
|
||||
name = "magazine (.50)"
|
||||
icon_state = "50ae"
|
||||
@@ -83,6 +86,9 @@
|
||||
multiple_sprites = 1
|
||||
sprite_modulo = 1
|
||||
|
||||
/obj/item/ammo_storage/magazine/c45/empty
|
||||
starting_ammo = 0
|
||||
|
||||
/obj/item/ammo_storage/magazine/uzi45 //Uzi mag
|
||||
name = "magazine (.45)"
|
||||
icon_state = "uzi45"
|
||||
@@ -92,6 +98,9 @@
|
||||
multiple_sprites = 1
|
||||
sprite_modulo = 2
|
||||
|
||||
/obj/item/ammo_storage/magazine/uzi45/empty
|
||||
starting_ammo = 0
|
||||
|
||||
/obj/item/ammo_storage/magazine/lawgiver
|
||||
name = "lawgiver magazine"
|
||||
desc = "State-of-the-art bluespace technology allows this magazine to generate new rounds from energy, requiring only a power source to refill the full suite of ammunition types."
|
||||
|
||||
@@ -107,6 +107,26 @@
|
||||
locked = 1
|
||||
req_lock_access = list(access_armory)
|
||||
|
||||
/datum/design/ammo_12mm
|
||||
name = "Ammunition Box (12mm)"
|
||||
desc = "A box of 12mm ammunition."
|
||||
id = "ammo_12mm"
|
||||
req_tech = list("combat" = 3, "materials" = 2)
|
||||
build_type = PROTOLATHE
|
||||
materials = list(MAT_IRON = 2000, MAT_GLASS = 200)
|
||||
category = "Weapons"
|
||||
build_path = /obj/item/ammo_storage/box/c12mm
|
||||
|
||||
/datum/design/magazine_12mm
|
||||
name = "Magazine (12mm)"
|
||||
desc = "A magazine that holds 12mm ammunition."
|
||||
id = "magazine_12mm"
|
||||
req_tech = list("combat" = 2)
|
||||
build_type = PROTOLATHE
|
||||
materials = list(MAT_IRON = 300)
|
||||
category = "Weapons"
|
||||
build_path = /obj/item/ammo_storage/magazine/a12mm/empty
|
||||
|
||||
/datum/design/decloner
|
||||
name = "Decloner"
|
||||
desc = "Your opponent will bubble into a messy pile of goop."
|
||||
@@ -209,6 +229,16 @@
|
||||
category = "Weapons"
|
||||
build_path = /obj/item/ammo_storage/box/c9mm
|
||||
|
||||
/datum/design/magazine_9mm
|
||||
name = "Magazine (9mm SMG)"
|
||||
desc = "A SMG magazine that holds 9mm ammunition."
|
||||
id = "magazine_9mm"
|
||||
req_tech = list("combat" = 2)
|
||||
build_type = PROTOLATHE
|
||||
materials = list(MAT_IRON = 300)
|
||||
category = "Weapons"
|
||||
build_path = /obj/item/ammo_storage/magazine/smg9mm/empty
|
||||
|
||||
/datum/design/stunshell
|
||||
name = "Stun Shell"
|
||||
desc = "A stunning shell for a shotgun."
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.9 KiB |
Reference in New Issue
Block a user