cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Flavour Enhancement: Guns

Browse Source
This commit is contained in:
Cerebulon
2020-07-14 04:04:59 +01:00
committed by VirgoBot
parent 39eb384d97
commit f1f2196077
31 changed files with 397 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/game/objects/random/guns_and_ammo.dm
View File

@@ -16,6 +16,7 @@
/obj/random/energy/item_to_spawn()
return pick(prob(3);/obj/item/weapon/gun/energy/laser,
prob(3);/obj/item/weapon/gun/energy/laser/sleek,
prob(4);/obj/item/weapon/gun/energy/gun,
prob(3);/obj/item/weapon/gun/energy/gun/burst,
prob(1);/obj/item/weapon/gun/energy/gun/nuclear,
@@ -29,7 +30,8 @@
prob(3);/obj/item/weapon/gun/energy/toxgun,
prob(4);/obj/item/weapon/gun/energy/taser,
prob(2);/obj/item/weapon/gun/energy/crossbow/largecrossbow,
prob(4);/obj/item/weapon/gun/energy/stunrevolver)
prob(4);/obj/item/weapon/gun/energy/stunrevolver,
prob(3);/obj/item/weapon/gun/energy/gun/compact)
/obj/random/energy/sec
name = "Random Security Energy Weapon"
@@ -54,6 +56,7 @@
prob(2);/obj/item/weapon/gun/projectile/automatic/c20r,
prob(2);/obj/item/weapon/gun/projectile/automatic/sts35,
prob(2);/obj/item/weapon/gun/projectile/automatic/z8,
prob(2);/obj/item/weapon/gun/projectile/automatic/combatsmg,
prob(4);/obj/item/weapon/gun/projectile/colt,
prob(2);/obj/item/weapon/gun/projectile/deagle,
prob(1);/obj/item/weapon/gun/projectile/deagle/camo,
@@ -193,6 +196,11 @@
prob(1);list(
/obj/item/weapon/gun/projectile/automatic/p90,
/obj/item/ammo_magazine/m9mmp90
),
prob(3);list(
/obj/item/weapon/gun/projectile/automatic/combatsmg,
/obj/item/ammo_magazine/m9mmt,
/obj/item/ammo_magazine/m9mmt
)
)
@@ -231,10 +239,20 @@
/obj/item/ammo_magazine/m762garand,
/obj/item/ammo_magazine/m762garand
),
prob(1);list(
/obj/item/weapon/gun/projectile/revolvingrifle,
/obj/item/ammo_magazine/s44/rifle,
/obj/item/ammo_magazine/s44/rifle
),
prob(1);list(
/obj/item/weapon/gun/projectile/automatic/bullpup,
/obj/item/ammo_magazine/m762,
/obj/item/ammo_magazine/m762
),
prob(1);list(
/obj/item/weapon/gun/projectile/caseless/prototype,
/obj/item/ammo_magazine/m5mmcaseless,
/obj/item/ammo_magazine/m5mmcaseless
)
)

60
code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm
View File

@@ -789,6 +789,66 @@
"hazard" = COLOR_OFF_WHITE
)
/decl/closet_appearance/crate/secure/heph
color = COLOR_GRAY20
decals = list(
"crate_bracing"
)
extra_decals = list(
"crate_stripe_left" = COLOR_NT_RED,
"crate_stripe_right" = COLOR_NT_RED,
"hazard" = COLOR_OFF_WHITE,
"heph" = COLOR_OFF_WHITE
)
/decl/closet_appearance/crate/secure/gilthari
color = COLOR_GRAY20
decals = list(
"crate_bracing"
)
extra_decals = list(
"crate_stripe_left" = COLOR_GOLD,
"crate_stripe_right" = COLOR_GOLD,
"hazard" = COLOR_OFF_WHITE,
"gilthari" = COLOR_OFF_WHITE
)
/decl/closet_appearance/crate/secure/ward
color = COLOR_OFF_WHITE
decals = list(
"crate_bracing"
)
extra_decals = list(
"crate_stripe_left" = COLOR_COMMAND_BLUE,
"crate_stripe_right" = COLOR_COMMAND_BLUE,
"hazard" = COLOR_OFF_WHITE,
"wt" = COLOR_OFF_WHITE
)
/decl/closet_appearance/crate/secure/hedberg
color = COLOR_GREEN_GRAY
decals = list(
"crate_bracing"
)
extra_decals = list(
"crate_stripe_left" = COLOR_OFF_WHITE,
"crate_stripe_right" = COLOR_OFF_WHITE,
"hazard" = COLOR_OFF_WHITE,
"hedberg" = COLOR_OFF_WHITE
)
/decl/closet_appearance/crate/secure/lawson
color = COLOR_SAN_MARINO_BLUE
decals = list(
"crate_bracing"
)
extra_decals = list(
"crate_stripe_left" = COLOR_OFF_WHITE,
"crate_stripe_right" = COLOR_OFF_WHITE,
"hazard" = COLOR_OFF_WHITE,
"lawson" = COLOR_OFF_WHITE
)
/decl/closet_appearance/crate/secure/hydroponics
extra_decals = list(
"crate_stripe_left" = COLOR_GREEN_GRAY,

25
code/game/objects/structures/crates_lockers/crates.dm
View File

@@ -333,13 +333,36 @@
desc = "A secure weapons crate."
closet_appearance = /decl/closet_appearance/crate/secure/weapon
/obj/structure/closet/crate/secure/hedberg
name = "weapons crate"
desc = "A secure weapons crate stamped with the logo of Hedberg-Hammarstrom."
closet_appearance = /decl/closet_appearance/crate/secure/hedberg
/obj/structure/closet/crate/secure/gilthari
name = "weapons crate"
desc = "A secure weapons crate embossed with the logo of Gilthari Exports."
closet_appearance = /decl/closet_appearance/crate/secure/gilthari
/obj/structure/closet/crate/secure/ward
name = "weapons crate"
desc = "A secure weapons crate decaled with the logo of Ward-Takahashi."
closet_appearance = /decl/closet_appearance/crate/secure/ward
/obj/structure/closet/crate/secure/heph
name = "weapons crate"
desc = "A secure weapons crate marked with the logo of Hephaestus Industries."
closet_appearance = /decl/closet_appearance/crate/secure/heph
/obj/structure/closet/crate/secure/lawson
name = "weapons crate"
desc = "A secure weapons crate marked with the logo of Lawson Arms."
closet_appearance = /decl/closet_appearance/crate/secure/lawson
/obj/structure/closet/crate/secure/phoron
name = "phoron crate"
desc = "A secure phoron crate."
closet_appearance = /decl/closet_appearance/crate/secure/hazard
/obj/structure/closet/crate/secure/gear
name = "gear crate"
desc = "A secure gear crate."