cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 09:02:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hardsuit fixes and grenade launcher restrictions (#3536)

Browse Source
This commit is contained in:
Alberyk
2017-10-07 02:45:07 -03:00
committed by Lohikar
parent 8c0ac3ae43
commit 12597e9849
7 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/projectiles/guns/launcher/grenade_launcher.dm
View File

@@ -12,6 +12,10 @@
throw_distance = 7
release_force = 5
var/blacklisted_grenades = list(
/obj/item/weapon/grenade/flashbang/clusterbang,
/obj/item/weapon/grenade/frag)
var/obj/item/weapon/grenade/chambered
var/list/grenades = new/list()
var/max_grenades = 5 //holds this + one in the chamber
@@ -43,6 +47,8 @@
user << "\A [chambered] is chambered."
/obj/item/weapon/gun/launcher/grenade/proc/load(obj/item/weapon/grenade/G, mob/user)
if(!can_load_grenade_type(G, user))
return
if(grenades.len >= max_grenades)
user << "<span class='warning'>[src] is full.</span>"
return
@@ -60,6 +66,12 @@
else
user << "<span class='warning'>[src] is empty.</span>"
/obj/item/weapon/gun/launcher/grenade/proc/can_load_grenade_type(obj/item/weapon/grenade/G, mob/user)
if(is_type_in_list(G, blacklisted_grenades))
user << "<span class='warning'>\The [G] doesn't seem to fit in \the [src]!</span>"
return FALSE
return TRUE
/obj/item/weapon/gun/launcher/grenade/attack_self(mob/user)
pump(user)

2
code/modules/projectiles/guns/projectile/dartgun.dm
View File

@@ -63,7 +63,7 @@
var/container_type = /obj/item/weapon/reagent_containers/glass/beaker
var/list/starting_chems = null
/obj/item/weapon/gun/projectile/dartgun/dartgun/Initialize()
/obj/item/weapon/gun/projectile/dartgun/Initialize()
. = ..()
if(starting_chems)
for(var/chem in starting_chems)