July Update Bugfixes: Better Than Alberyk Edition. (#5031)

Fixes #5030
Fixes #5028
Fixes #5040
Fixes american flags not showing up
Fixes gauss rifles being overpowered

I may add more bugfixes with this PR if anything juicy comes up.
This commit is contained in:
LordFowl
2018-07-23 15:57:00 -04:00
committed by Erki
parent dd4ef4b3c3
commit e7fc543189
5 changed files with 19 additions and 14 deletions
@@ -333,7 +333,7 @@
recoil = 6
release_speed = 15
release_speed = 5
var/list/belt = new/list()
var/belt_size = 12 //holds this + one in the chamber
recoil_wielded = 2
@@ -384,20 +384,22 @@
if(bolt)
if(tension < max_tension)
M << "<span class='warning'>You pump [src], charging the magnetic coils.</span>"
tension++
if(do_after(M, 5 * tension))
M << "<span class='warning'>You pump [src], charging the magnetic coils.</span>"
tension++
else
M << "<span class='notice'>\The [src]'s magnetic coils are at maximum charge.</span>"
return
var/obj/item/next
if(belt.len)
next = belt[1]
if(next)
belt -= next //Remove grenade from loaded list.
bolt = next
M << "<span class='warning'>You pump [src], loading \a [next] into the chamber.</span>"
else
M << "<span class='warning'>You pump [src], but the magazine is empty.</span>"
if(do_after(M, 10))
if(next)
belt -= next //Remove grenade from loaded list.
bolt = next
M << "<span class='warning'>You pump [src], loading \a [next] into the chamber.</span>"
else
M << "<span class='warning'>You pump [src], but the magazine is empty.</span>"
/obj/item/weapon/gun/launcher/crossbow/vaurca/proc/load(obj/item/W, mob/user)
if(belt.len >= belt_size)
+1 -1
View File
@@ -449,7 +449,7 @@
/obj/item/weapon/flag/america
name = "Old World flag"
desc = "The banner of an ancient nation, its glory old."
flag_path = "soldglory"
flag_path = "oldglory"
/obj/item/weapon/flag/america/l
flag_size = 1
+1 -1
View File
@@ -518,7 +518,7 @@ var/list/mineral_can_smooth_with = list(
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
if(ishuman(user))
var/mob/living/carbon/human/H
var/mob/living/carbon/human/H = user
var/turf/destination = GetAbove(H)
if(destination)
@@ -688,9 +688,6 @@
if (istype(T) && (T:l_ear || T:r_ear) && istype((T:l_ear || T:r_ear), /obj/item/clothing/ears/earmuffs))
continue
if (!vampire_can_affect_target(T, 0))
continue
to_chat(T, "<span class='danger'>You hear an ear piercing shriek and feel your senses go dull!</span>")
T.Weaken(5)
T.ear_deaf = 20
+6
View File
@@ -145,8 +145,14 @@
return
if(destination.density)
to_chat(src, "<span class='notice'>There is something obstructing your destination!</span>")
return
for(var/obj/O in destination)
if(O.density)
to_chat(src, "<span class='notice'>There is something obstructing your destination!</span>")
return
visible_message("<span class='notice'>The [src] begins to climb [(direction == UP) ? "upwards" : "downwards"].</span>",
"<span class='notice'>You begin to climb [(direction == UP) ? "upwards" : "downwards"].</span>")
var/climb_chance = 50