mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-30 02:52:30 +00:00
f8ee9961d5
* Fixes some inconsistencies with the chaplain revolver and gets rid of a weird ammo define (#76237) ## About The Pull Request Firstly, I gave the revolver a new sprite. I mean, this isn't so much of an improvement as it is a reference I wanted to go with, so if people go 'no not a new sprite' I don't mind reverting. What's the reference? Check the new name I added as a potential name roll.  Secondly; I applied to the gun itself revenant bane, the ability to clear runes, and proper magic immunity as a full null rod would enable. This last bit was a deliberate design choice, but the divine bow has full magic protection, so I think this is now more of a consistency consideration compared to the divine bow. Thirdly, the revolver is a .38 revolver, HOWEVER, it uses a damage multiplier to bring it back to the damage it did originally. It also cannot be reloaded without the prayer action. No cheating. Effectively, this is the same mechanically as it was before. It rarely does a funny crit fanfare. This does nothing mechanically, I just thought it was a funny nod to the sprite's reference (and I guess another game that the crit fanfare is based on). Borrowed parts of the code and sprite from this April Fool's pr by Wallemations > https://github.com/tgstation/tgstation/pull/74425 ## Why It's Good For The Game I think this might have been a little forgotten since implementation now that we have another projectile weapon for the chaplain. So I'm brushing it up a bit. ## Changelog 🆑 fix: Makes the chaplain's revolver consistent with its immediate sibling, the Divine Bow, by giving it similar statistics. code: Makes the chaplain revolver a .38 but prevents it from being loaded without using the special prayer action. Also applies a damage multiplier to keep it at the original 18 force. Mechanically, no different. sprite: Gives the chaplain revolver a new sprite. code: Removes an unnecessary admin log when removing runes. /🆑 * Fixes some inconsistencies with the chaplain revolver and gets rid of a weird ammo define --------- Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com> Co-authored-by: Pinta <68373373+softcerv@users.noreply.github.com>
73 lines
3.5 KiB
Plaintext
73 lines
3.5 KiB
Plaintext
|
|
// check_pierce() return values
|
|
/// Default behavior: hit and delete self
|
|
#define PROJECTILE_PIERCE_NONE 0
|
|
/// Hit the thing but go through without deleting. Causes on_hit to be called with pierced = TRUE
|
|
#define PROJECTILE_PIERCE_HIT 1
|
|
/// Entirely phase through the thing without ever hitting.
|
|
#define PROJECTILE_PIERCE_PHASE 2
|
|
// Delete self without hitting
|
|
#define PROJECTILE_DELETE_WITHOUT_HITTING 3
|
|
|
|
// Caliber defines: (current count stands at 24)
|
|
/// The caliber used by the [L6 SAW][/obj/item/gun/ballistic/automatic/l6_saw].
|
|
#define CALIBER_712X82MM "mm71282"
|
|
/// The caliber used by the [security auto-rifle][/obj/item/gun/ballistic/automatic/wt550].
|
|
#define CALIBER_46X30MM "4.6x30mm"
|
|
/// The caliber used by the Nanotrasen Saber SMG, PP-95 SMG and Type U3 Uzi. Also used as the default caliber for pistols but only the stechkin APS machine pistol doesn't override it.
|
|
#define CALIBER_9MM "9mm"
|
|
/// The caliber used as the default for ballistic guns. Only not overridden for the [surplus rifle][/obj/item/gun/ballistic/automatic/surplus].
|
|
#define CALIBER_10MM "10mm"
|
|
/// The caliber used by most revolver variants.
|
|
#define CALIBER_357 ".357"
|
|
/// The caliber used by the detective's revolver.
|
|
#define CALIBER_38 ".38"
|
|
/// The caliber used by the C-20r SMG, the tommygun, and the M1911 pistol.
|
|
#define CALIBER_45 ".45"
|
|
/// The caliber used by sniper rifles.
|
|
#define CALIBER_50BMG ".50BMG"
|
|
/// The caliber used by the desert eagle.
|
|
#define CALIBER_50AE ".50AE"
|
|
/// The caliber used by the gyrojet pistol.
|
|
#define CALIBER_75 ".75"
|
|
/// The caliber used by [one revolver variant][/obj/item/gun/ballistic/revolver/nagant].
|
|
#define CALIBER_N762 "n762"
|
|
/// The caliber used by the the M-90gl Carbine, and NT-ARG 'Boarder'.
|
|
#define CALIBER_A556 "a556"
|
|
/// The caliber used by bolt action rifles.
|
|
#define CALIBER_A762 "a762"
|
|
/// The caliber used by shotguns.
|
|
#define CALIBER_SHOTGUN "shotgun"
|
|
/// The caliber used by grenade launchers.
|
|
#define CALIBER_40MM "40mm"
|
|
/// The caliber used by rocket launchers.
|
|
#define CALIBER_84MM "84mm"
|
|
/// The caliber used by laser guns.
|
|
#define CALIBER_LASER "laser"
|
|
/// The caliber used by most energy guns.
|
|
#define CALIBER_ENERGY "energy"
|
|
/// The acliber used by foam force and donksoft toy guns.
|
|
#define CALIBER_FOAM "foam_force"
|
|
/// The caliber used by the bow and arrow.
|
|
#define CALIBER_ARROW "arrow"
|
|
/// The caliber used by the harpoon gun.
|
|
#define CALIBER_HARPOON "harpoon"
|
|
/// The caliber used by the meat hook.
|
|
#define CALIBER_HOOK "hook"
|
|
/// The caliber used by the changeling tentacle mutation.
|
|
#define CALIBER_TENTACLE "tentacle"
|
|
|
|
/// For gunpoints, how many tiles around the target the shooter can roam without losing their shot
|
|
#define GUNPOINT_SHOOTER_STRAY_RANGE 2
|
|
|
|
//Designed for things that need precision trajectories like projectiles.
|
|
//Don't use this for anything that you don't absolutely have to use this with (like projectiles!) because it isn't worth using a datum unless you need accuracy down to decimal places in pixels.
|
|
|
|
//You might see places where it does - 16 - 1. This is intentionally 17 instead of 16, because of how byond's tiles work and how not doing it will result in rounding errors like things getting put on the wrong turf.
|
|
|
|
#define RETURN_PRECISE_POSITION(A) new /datum/position(A)
|
|
#define RETURN_PRECISE_POINT(A) new /datum/point(A)
|
|
|
|
#define RETURN_POINT_VECTOR(ATOM, ANGLE, SPEED) (new /datum/point/vector(ATOM, null, null, null, null, ANGLE, SPEED))
|
|
#define RETURN_POINT_VECTOR_INCREMENT(ATOM, ANGLE, SPEED, AMT) (new /datum/point/vector(ATOM, null, null, null, null, ANGLE, SPEED, AMT))
|