cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 07:08:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Upstream 12 15 25 unique reskins fixes (#5019)

Browse Source 
This branch needs help, tons of datums to make for the customizable
items.

---------

Co-authored-by: Alexis <catmc8565@gmail.com>
This commit is contained in:
nevimer
2026-01-10 13:14:26 -05:00
committed by GitHub
co-authored by Alexis
parent e82dd05cf1
commit a33fd49968
96 changed files with 4246 additions and 2843 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/ballistic.dm
-1
View File
@@ -9,7 +9,6 @@
pickup_sound = 'sound/items/handling/gun/gun_pick_up.ogg'
drop_sound = 'sound/items/handling/gun/gun_drop.ogg'
sound_vary = TRUE
unique_reskin_changes_base_icon_state = TRUE
min_recoil = 0.1
code/modules/projectiles/guns/ballistic/revolver.dm
+46 -13
View File
@@ -97,8 +97,7 @@
. = ..()
var/live_ammo = get_ammo(FALSE, FALSE)
. += "[live_ammo ? live_ammo : "None"] of those are live rounds."
if (current_skin)
. += span_notice("It can be spun with [EXAMINE_HINT("alt-click")].")
. += span_notice("It can be spun with [EXAMINE_HINT("alt-click")].")
/obj/item/gun/ballistic/revolver/ignition_effect(atom/A, mob/user)
if(last_fire && last_fire + 15 SECONDS > world.time)
@@ -112,6 +111,47 @@
base_icon_state = "c38"
fire_sound = 'sound/items/weapons/gun/revolver/shot.ogg'
// 38 special skins
/datum/atom_skin/det_revolver
abstract_type = /datum/atom_skin/det_revolver
change_base_icon_state = TRUE
/datum/atom_skin/det_revolver/default
preview_name = "Default"
new_icon_state = "c38"
/datum/atom_skin/det_revolver/fitz_special
preview_name = "Fitz Special"
new_icon_state = "c38_fitz"
/datum/atom_skin/det_revolver/police_positive_special
preview_name = "Police Positive Special"
new_icon_state = "c38_police"
/datum/atom_skin/det_revolver/blued_steel
preview_name = "Blued Steel"
new_icon_state = "c38_blued"
/datum/atom_skin/det_revolver/stainless_steel
preview_name = "Stainless Steel"
new_icon_state = "c38_stainless"
/datum/atom_skin/det_revolver/gold_trim
preview_name = "Gold Trim"
new_icon_state = "c38_trim"
/datum/atom_skin/det_revolver/golden
preview_name = "Golden"
new_icon_state = "c38_gold"
/datum/atom_skin/det_revolver/peacemaker
preview_name = "The Peacemaker"
new_icon_state = "c38_peacemaker"
/datum/atom_skin/det_revolver/black_panther
preview_name = "Black Panther"
new_icon_state = "c38_panther"
/obj/item/gun/ballistic/revolver/c38/detective
name = "\improper Colt Detective Special"
desc = "A classic, if not outdated, law enforcement firearm. Uses .38 Special rounds. \nSome spread rumors that if you loosen the barrel with a wrench, you can \"improve\" it."
@@ -126,17 +166,10 @@
misfire_percentage_increment = 25 //about 1 in 4 rounds, which increases rapidly every shot
obj_flags = UNIQUE_RENAME
unique_reskin = list(
"Default" = "c38",
"Fitz Special" = "c38_fitz",
"Police Positive Special" = "c38_police",
"Blued Steel" = "c38_blued",
"Stainless Steel" = "c38_stainless",
"Gold Trim" = "c38_trim",
"Golden" = "c38_gold",
"The Peacemaker" = "c38_peacemaker",
"Black Panther" = "c38_panther"
)
/obj/item/gun/ballistic/revolver/c38/detective/Initialize(mapload)
. = ..()
AddComponent(/datum/component/reskinable_item, /datum/atom_skin/det_revolver)
/obj/item/gun/ballistic/revolver/badass
name = "\improper Badass Revolver"
code/modules/projectiles/guns/ballistic/shotgun.dm
+33 -7
View File
@@ -285,6 +285,35 @@
/obj/item/gun/ballistic/shotgun/bulldog/unrestricted
pin = /obj/item/firing_pin
// Double barrel shotgun skins
/datum/atom_skin/bar_shotgun
abstract_type = /datum/atom_skin/bar_shotgun
change_base_icon_state = TRUE
/datum/atom_skin/bar_shotgun/default
preview_name = "Standard Finish"
new_icon_state = "dshotgun"
/datum/atom_skin/bar_shotgun/dark_red
preview_name = "Dark Red Finish"
new_icon_state = "dshotgun_d"
/datum/atom_skin/bar_shotgun/ash
preview_name = "Ash"
new_icon_state = "dshotgun_f"
/datum/atom_skin/bar_shotgun/faded_grey
preview_name = "Faded Grey"
new_icon_state = "dshotgun_g"
/datum/atom_skin/bar_shotgun/maple
preview_name = "Maple"
new_icon_state = "dshotgun_l"
/datum/atom_skin/bar_shotgun/rosewood
preview_name = "Rosewood"
new_icon_state = "dshotgun_p"
/////////////////////////////
// DOUBLE BARRELED SHOTGUN //
/////////////////////////////
@@ -304,18 +333,15 @@
sawn_desc = "Omar's coming!"
obj_flags = UNIQUE_RENAME
rack_sound_volume = 0
unique_reskin = list("Default" = "dshotgun",
"Dark Red Finish" = "dshotgun_d",
"Ash" = "dshotgun_f",
"Faded Grey" = "dshotgun_g",
"Maple" = "dshotgun_l",
"Rosewood" = "dshotgun_p"
)
semi_auto = TRUE
bolt_type = BOLT_TYPE_NO_BOLT
can_be_sawn_off = TRUE
pb_knockback = 3 // it's a super shotgun!
/obj/item/gun/ballistic/shotgun/doublebarrel/Initialize(mapload)
. = ..()
AddComponent(/datum/component/reskinable_item, /datum/atom_skin/bar_shotgun)
/obj/item/gun/ballistic/shotgun/doublebarrel/sawoff(mob/user)
. = ..()
if(.)