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

Removes a lot of redefined procs (#26186)

Browse Source 
* aaaaaaaaaaaaaaa

* Forgor

* Adds missing /proc/

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
DGamerL
2024-07-30 13:19:32 +00:00
committed by GitHub
parent cbeedfca9f
commit b497e4c925
76 changed files with 154 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/projectile/revolver.dm
+1 -4
View File
@@ -11,6 +11,7 @@
/obj/item/gun/projectile/revolver/examine(mob/user)
. = ..()
. += "[get_ammo(0, 0)] of those are live rounds."
. += "<span class='notice'>You can <b>Alt-Click</b> [src] to spin it's barrel.</span>"
/obj/item/gun/projectile/revolver/chamber_round(spin = 1)
@@ -80,10 +81,6 @@
boolets += magazine.ammo_count(countempties)
return boolets
/obj/item/gun/projectile/revolver/examine(mob/user)
. = ..()
. += "[get_ammo(0,0)] of those are live rounds."
/obj/item/gun/projectile/revolver/fake
/obj/item/gun/projectile/revolver/fake/examine(mob/user)
code/modules/projectiles/guns/projectile/shotgun.dm
+2 -5
View File
@@ -21,6 +21,8 @@
/obj/item/gun/projectile/shotgun/examine(mob/user)
. = ..()
if(chambered)
. += "A [chambered.BB ? "live" : "spent"] one is in the chamber."
. += get_shotgun_info()
/obj/item/gun/projectile/shotgun/proc/get_shotgun_info()
@@ -72,11 +74,6 @@
var/obj/item/ammo_casing/AC = magazine.get_round() //load next casing.
chambered = AC
/obj/item/gun/projectile/shotgun/examine(mob/user)
. = ..()
if(chambered)
. += "A [chambered.BB ? "live" : "spent"] one is in the chamber."
/obj/item/gun/projectile/shotgun/lethal
mag_type = /obj/item/ammo_box/magazine/internal/shot/lethal