cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1477 from Yoshax/renegades

Browse Source 
Adjusts renagade gun list and spawns the gun in a bag if one exists
This commit is contained in:
Datraen
2016-04-28 19:20:44 -04:00
parent 4416d17b0a 72ece69850
commit 3e8c503d05
1 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
code/game/antagonist/station/renegade.dm
View File

@@ -24,19 +24,32 @@ var/datum/antagonist/renegade/renegades
initial_spawn_target = 6
var/list/spawn_guns = list(
/obj/item/weapon/gun/energy/gun,
/obj/item/weapon/gun/energy/laser,
/obj/item/weapon/gun/projectile,
/obj/item/weapon/gun/projectile/revolver/detective,
/obj/item/weapon/gun/projectile/automatic/c20r,
/obj/item/weapon/gun/projectile/deagle/camo,
/obj/item/weapon/gun/projectile/pistol,
/obj/item/weapon/silencer,
/obj/item/weapon/gun/projectile/shotgun/pump,
/obj/item/weapon/gun/projectile/shotgun/pump/combat,
/obj/item/weapon/gun/energy/captain,
/obj/item/weapon/gun/energy/lasercannon,
/obj/item/weapon/gun/energy/xray,
/obj/item/weapon/gun/energy/gun,
/obj/item/weapon/gun/energy/gun/burst,
/obj/item/weapon/gun/energy/gun/nuclear,
/obj/item/weapon/gun/energy/crossbow,
/obj/item/weapon/gun/energy/crossbow/largecrossbow,
/obj/item/weapon/gun/projectile/automatic,
/obj/item/weapon/gun/projectile/automatic/mini_uzi,
/obj/item/weapon/gun/energy/crossbow
/obj/item/weapon/gun/projectile/automatic/c20r,
/obj/item/weapon/gun/projectile/automatic/sts35,
/obj/item/weapon/gun/projectile/automatic/wt550,
/obj/item/weapon/gun/projectile/automatic/z8,
/obj/item/weapon/gun/projectile/colt/detective,
/obj/item/weapon/gun/projectile/sec/wood,
/obj/item/weapon/gun/projectile/silenced,
/obj/item/weapon/gun/projectile/pistol,
/obj/item/weapon/gun/projectile/revolver,
/obj/item/weapon/gun/projectile/shotgun/pump,
/obj/item/weapon/gun/projectile/shotgun/pump/combat,
/obj/item/weapon/gun/projectile/shotgun/doublebarrel,
list(/obj/item/weapon/gun/projectile/shotgun/doublebarrel/pellet, /obj/item/weapon/gun/projectile/shotgun/doublebarrel/sawn),
list(/obj/item/weapon/gun/projectile/deagle, /obj/item/weapon/gun/projectile/deagle/gold, /obj/item/weapon/gun/projectile/deagle/camo),
list(/obj/item/weapon/gun/projectile/revolver/detective, /obj/item/weapon/gun/projectile/revolver/deckard)
)
/datum/antagonist/renegade/New()
@@ -58,7 +71,19 @@ var/datum/antagonist/renegade/renegades
return
var/gun_type = pick(spawn_guns)
if(islist(gun_type))
gun_type = pick(gun_type)
var/obj/item/gun = new gun_type(get_turf(player))
// Attempt to put into a container.
if(player.equip_to_storage(gun))
return
// If that failed, attempt to put into any valid non-handslot
if(player.equip_to_appropriate_slot(gun))
return
// If that failed, then finally attempt to at least let the player carry the weapon
player.put_in_hands(gun)