shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

first commit with everything

Browse Source
This commit is contained in:
SandPoot
2023-01-08 21:36:57 -03:00
parent e292452aae
commit f2a49bc319
14 changed files with 144 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/ballistic.dm
+1 -1
View File
@@ -23,7 +23,7 @@
/obj/item/gun/ballistic/update_icon_state()
if(current_skin)
icon_state = "[unique_reskin[current_skin]][suppressed ? "-suppressed" : ""][sawn_off ? "-sawn" : ""]"
icon_state = "[unique_reskin[current_skin]["icon_state"]][suppressed ? "-suppressed" : ""][sawn_off ? "-sawn" : ""]"
else
icon_state = "[initial(icon_state)][suppressed ? "-suppressed" : ""][sawn_off ? "-sawn" : ""]"
code/modules/projectiles/guns/ballistic/pistol.dm
+12 -11
View File
@@ -30,27 +30,28 @@
can_unsuppress = TRUE
automatic_burst_overlay = FALSE
obj_flags = UNIQUE_RENAME
unique_reskin = list("Default" = "cde",
"N-99" = "n99",
"Stealth" = "stealthpistol",
"HKVP-78" = "vp78",
"Luger" = "p08b",
"Mk.58" = "secguncomp",
"PX4 Storm" = "px4"
)
unique_reskin = list(
"Default" = list("icon_state" = "cde"),
"N-99" = list("icon_state" = "n99"),
"Stealth" = list("icon_state" = "stealthpistol"),
"HKVP-78" = list("icon_state" = "vp78"),
"Luger" = list("icon_state" = "p08b"),
"Mk.58" = list("icon_state" = "secguncomp"),
"PX4 Storm" = list("icon_state" = "px4")
)
/obj/item/gun/ballistic/automatic/pistol/modular/update_icon_state()
if(current_skin)
icon_state = "[unique_reskin[current_skin]][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
icon_state = "[unique_reskin[current_skin]["icon_state"]][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
else
icon_state = "[initial(icon_state)][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
/obj/item/gun/ballistic/automatic/pistol/modular/update_overlays()
. = ..()
if(magazine && suppressed)
. += "[unique_reskin[current_skin]]-magazine-sup" //Yes, this means the default iconstate can't have a magazine overlay
. += "[unique_reskin[current_skin]["icon_state"]]-magazine-sup" //Yes, this means the default iconstate can't have a magazine overlay
else if (magazine)
. += "[unique_reskin[current_skin]]-magazine"
. += "[unique_reskin[current_skin]["icon_state"]]-magazine"
/obj/item/gun/ballistic/automatic/pistol/m1911
name = "\improper M1911"
code/modules/projectiles/guns/ballistic/revolver.dm
+28 -23
View File
@@ -88,13 +88,15 @@
/obj/item/gun/ballistic/revolver/syndicate
obj_flags = UNIQUE_RENAME
unique_reskin = list("Default" = "revolver",
"Silver" = "russianrevolver",
"Robust" = "revolvercit",
"Bulky" = "revolverhakita",
"Polished" = "revolvertoriate",
"Soulless" = "revolveroldflip",
"Soul" = "revolverold")
unique_reskin = list(
"Default" = list("icon_state" = "revolver"),
"Silver" = list("icon_state" = "russianrevolver"),
"Robust" = list("icon_state" = "revolvercit"),
"Bulky" = list("icon_state" = "revolverhakita"),
"Polished" = list("icon_state" = "revolvertoriate"),
"Soulless" = list("icon_state" = "revolveroldflip"),
"Soul" = list("icon_state" = "revolverold")
)
/obj/item/gun/ballistic/revolver/detective
name = "\improper .38 Mars Special"
@@ -102,12 +104,13 @@
icon_state = "detective"
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38
obj_flags = UNIQUE_RENAME
unique_reskin = list("Default" = "detective",
"Leopard Spots" = "detective_leopard",
"Black Panther" = "detective_panther",
"Gold Trim" = "detective_gold",
"The Peacemaker" = "detective_peacemaker"
)
unique_reskin = list(
"Default" = list("icon_state" = "detective"),
"Leopard Spots" = list("icon_state" = "detective_leopard"),
"Black Panther" = list("icon_state" = "detective_panther"),
"Gold Trim" = list("icon_state" = "detective_gold"),
"The Peacemaker" = list("icon_state" = "detective_peacemaker")
)
var/list/safe_calibers
/obj/item/gun/ballistic/revolver/detective/Initialize(mapload)
@@ -294,13 +297,14 @@
mag_type = /obj/item/ammo_box/magazine/internal/shot/dual
sawn_desc = "Omar's coming!"
obj_flags = UNIQUE_RENAME
unique_reskin = list("Default" = "dshotgun",
"Dark Red Finish" = "dshotgun-d",
"Ash" = "dshotgun-f",
"Faded Grey" = "dshotgun-g",
"Maple" = "dshotgun-l",
"Rosewood" = "dshotgun-p"
)
unique_reskin = list(
"Default" = list("icon_state" = "dshotgun"),
"Dark Red Finish" = list("icon_state" = "dshotgun-d"),
"Ash" = list("icon_state" = "dshotgun-f"),
"Faded Grey" = list("icon_state" = "dshotgun-g"),
"Maple" = list("icon_state" = "dshotgun-l"),
"Rosewood" = list("icon_state" = "dshotgun-p")
)
/obj/item/gun/ballistic/revolver/doublebarrel/attackby(obj/item/A, mob/user, params)
..()
@@ -342,9 +346,10 @@
slot_flags = null
mag_type = /obj/item/ammo_box/magazine/internal/shot/improvised
sawn_desc = "I'm just here for the gasoline."
unique_reskin = list("Default" = "ishotgun",
"Cobbled" = "old_ishotgun"
)
unique_reskin = list(
"Default" = list("icon_state" = "ishotgun"),
"Cobbled" = list("icon_state" = "old_ishotgun")
)
var/slung = FALSE
/obj/item/gun/ballistic/revolver/doublebarrel/improvised/attackby(obj/item/A, mob/user, params)
code/modules/projectiles/guns/ballistic/shotgun.dm
+10 -8
View File
@@ -98,9 +98,10 @@
fire_delay = 7
mag_type = /obj/item/ammo_box/magazine/internal/shot/riot
sawn_desc = "Come with me if you want to live."
unique_reskin = list("Tactical" = "riotshotgun",
"Wood Stock" = "wood_riotshotgun"
)
unique_reskin = list(
"Tactical" = list("icon_state" = "riotshotgun"),
"Wood Stock" = list("icon_state" = "wood_riotshotgun")
)
/obj/item/gun/ballistic/shotgun/riot/attackby(obj/item/A, mob/user, params)
..()
@@ -238,9 +239,10 @@
fire_delay = 5
mag_type = /obj/item/ammo_box/magazine/internal/shot/com
w_class = WEIGHT_CLASS_HUGE
unique_reskin = list("Tactical" = "cshotgun",
"Slick" = "cshotgun_slick"
)
unique_reskin = list(
"Tactical" = list("icon_state" = "cshotgun"),
"Slick" = list("icon_state" = "cshotgun_slick")
)
/obj/item/gun/ballistic/shotgun/automatic/combat/compact
name = "warden's combat shotgun"
@@ -279,7 +281,7 @@
update_icon()
/obj/item/gun/ballistic/shotgun/automatic/combat/compact/update_icon_state()
icon_state = "[current_skin ? unique_reskin[current_skin] : "cshotgun"][stock ? "" : "c"]"
icon_state = "[current_skin ? unique_reskin[current_skin]["icon_state"] : "cshotgun"][stock ? "" : "c"]"
/obj/item/gun/ballistic/shotgun/automatic/combat/compact/afterattack(atom/target, mob/living/user, flag, params)
if(!stock)
@@ -381,7 +383,7 @@
/obj/item/gun/ballistic/shotgun/leveraction/update_icon_state()
if(current_skin)
icon_state = "[unique_reskin[current_skin]][sawn_off ? "-sawn" : ""][chambered ? "" : "-e"]"
icon_state = "[unique_reskin[current_skin]["icon_state"]][sawn_off ? "-sawn" : ""][chambered ? "" : "-e"]"
else
icon_state = "[initial(icon_state)][sawn_off ? "-sawn" : ""][chambered ? "" : "-e"]"