cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 20:13:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds seven alternate finishes for the .357 Revolver (#31668)

Browse Source 
* Adds Syndie Subtype and extra finishes

* Switches all mentions of standard revolver to the new syndicate version

* Wait why are we spinning the *barrel*

* removes duped name and description
This commit is contained in:
MixityMaxity
2026-02-28 06:07:58 +11:00
committed by GitHub
parent ae181bf265
commit c4fb9bff75
7 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/striketeam_syndicate.dm
+1 -1
View File
@@ -133,7 +133,7 @@ GLOBAL_VAR_INIT(sent_syndicate_strike_team, 0)
equip_to_slot_or_del(new /obj/item/storage/backpack/security(src), ITEM_SLOT_BACK)
equip_to_slot_or_del(new /obj/item/storage/box/survival_syndie(src), ITEM_SLOT_IN_BACKPACK)
equip_to_slot_or_del(new /obj/item/gun/projectile/revolver(src), ITEM_SLOT_IN_BACKPACK)
equip_to_slot_or_del(new /obj/item/gun/projectile/revolver/syndie(src), ITEM_SLOT_IN_BACKPACK)
equip_to_slot_or_del(new /obj/item/ammo_box/a357(src), ITEM_SLOT_IN_BACKPACK)
equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/combat/nanites(src), ITEM_SLOT_IN_BACKPACK)
equip_to_slot_or_del(new /obj/item/grenade/plastic/c4/x4(src), ITEM_SLOT_IN_BACKPACK)
code/modules/projectiles/guns/chaos_bolt.dm
+1 -1
View File
@@ -365,7 +365,7 @@
if("chaos wand")
item_to_summon = /obj/item/gun/magic/wand/chaos
if("revolver")
item_to_summon = /obj/item/gun/projectile/revolver
item_to_summon = /obj/item/gun/projectile/revolver/syndie
if("aeg")
item_to_summon = /obj/item/gun/energy/gun/nuclear
if("tarot deck")
code/modules/projectiles/guns/projectile/revolver.dm
+21 -2
View File
@@ -16,7 +16,8 @@
/obj/item/gun/projectile/revolver/examine(mob/user)
. = ..()
. += "[get_ammo(0, 0)] of those are live rounds."
. += SPAN_NOTICE("You can <b>Alt-Click</b> [src] to spin it's barrel.")
if(istype(magazine, /obj/item/ammo_box/magazine/internal/cylinder)) // Ideally, a double barrel shotgun or peashooter has no cylinder.
. += SPAN_NOTICE("You can <b>Alt-Click</b> [src] to spin it's cylinder.")
/obj/item/gun/projectile/revolver/chamber_round(spin = 1)
if(spin)
@@ -65,7 +66,11 @@
/obj/item/gun/projectile/revolver/AltClick(mob/user)
if(user.stat || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !Adjacent(user))
return
if(user.incapacitated())
to_chat(user, SPAN_WARNING("You can't do that right now!"))
return
if(unique_reskin && !current_skin && loc == user)
reskin_gun(user)
if(!istype(magazine, /obj/item/ammo_box/magazine/internal/cylinder))
return ..()
var/obj/item/ammo_box/magazine/internal/cylinder/C = magazine
@@ -113,6 +118,20 @@
user.bleed(BLOOD_VOLUME_NORMAL)
user.death() // Just in case
/// Syndicate .357, same as the basetype except it can be customised
/obj/item/gun/projectile/revolver/syndie
unique_reskin = TRUE
/obj/item/gun/projectile/revolver/syndie/Initialize(mapload)
. = ..()
options["Default"] = "revolver"
options["Golden Finish"] = "revolver-gold"
options["Silver Finish"] = "revolver-silver"
options["Bronze Finish"] = "revolver-bronze"
options["Copper Finish"] = "revolver-copper"
options["Fancy"] = "revolver-fancy"
options["Rose Gold Finish"] = "revolver-rose"
/// Summoned by the Finger Gun spell, from advanced mimery traitor item
/obj/item/gun/projectile/revolver/fingergun
name = "finger gun"