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

Merge pull request #30824

Browse Source
This commit is contained in:
Cyberboss
2017-09-17 21:08:12 -04:00
parent ff8c09fe1b 81e5154a70
commit 08a3c4bd0d
30 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/ballistic/laser_gatling.dm
+1 -1
View File
@@ -114,7 +114,7 @@
var/obj/item/minigunpack/ammo_pack
/obj/item/gun/ballistic/minigun/Initialize()
if(istype(loc, /obj/item/minigunpack)) //We should spawn inside a ammo pack so let's use that one.
if(istype(loc, /obj/item/minigunpack)) //We should spawn inside an ammo pack so let's use that one.
ammo_pack = loc
else
return INITIALIZE_HINT_QDEL //No pack, no gun
code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+1 -1
View File
@@ -534,7 +534,7 @@
/obj/item/borg/upgrade/modkit/tracer/adjustable
name = "adjustable tracer bolts"
desc = "Causes kinetic accelerator bolts to have a adjustable-colored tracer trail and explosion. Use in-hand to change color."
desc = "Causes kinetic accelerator bolts to have an adjustable-colored tracer trail and explosion. Use in-hand to change color."
/obj/item/borg/upgrade/modkit/tracer/adjustable/attack_self(mob/user)
bolt_color = input(user,"Choose Color") as color