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

Removed zombies, added Skellingtons for halloween. Some bug fixes

Browse Source
This commit is contained in:
ZomgPonies
2013-10-31 03:21:34 -04:00
parent 11b2fb2784
commit a227fa6cbe
12 changed files with 9 additions and 733 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/bullets.dm
+4
View File
@@ -43,6 +43,10 @@
caliber = ".45"
projectile_type = "/obj/item/projectile/bullet/midbullet"
/obj/item/ammo_casing/c10mm
desc = "A 10mm bullet casing."
caliber = "10mm"
projectile_type = "obj/item/projectile/bullet/midbullet2"
/obj/item/ammo_casing/a12mm
desc = "A 12mm bullet casing."
code/modules/projectiles/guns/projectile/shotgun.dm
+2 -2
View File
@@ -11,14 +11,14 @@
if(istype(A, /obj/item/ammo_box))
var/obj/item/ammo_box/AM = A
for(var/obj/item/ammo_casing/AC in AM.stored_ammo)
if(magazine.give_round(AC))
if(magazine && magazine.give_round(AC))
AM.stored_ammo -= AC
num_loaded++
else
break
if(istype(A, /obj/item/ammo_casing))
var/obj/item/ammo_casing/AC = A
if(magazine.give_round(AC))
if(magazine && magazine.give_round(AC))
user.drop_item()
AC.loc = src
num_loaded++