From 944bd3f5bb3f56fc008859b9ca81beae7b83f163 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Fri, 22 Apr 2016 16:19:47 +0100 Subject: [PATCH 1/4] Adjusts renagade gun list and spawns the gun in a bag if one exists --- code/game/antagonist/station/renegade.dm | 50 ++++++++++++++++++------ 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/code/game/antagonist/station/renegade.dm b/code/game/antagonist/station/renegade.dm index b077977fd7..2a3b498ddc 100644 --- a/code/game/antagonist/station/renegade.dm +++ b/code/game/antagonist/station/renegade.dm @@ -15,19 +15,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/automatic/as24, + /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, + list(/obj/item/weapon/gun/projectile/shotgun/doublebarrel, /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() @@ -49,9 +62,22 @@ var/datum/antagonist/renegade/renegades return var/gun_type = pick(spawn_guns) - var/obj/item/gun = new gun_type(get_turf(player)) - player.put_in_hands(gun) + if(islist(gun_type)) + gun_type = pick(gun_type) + var/obj/item/gun = new gun_type(get_turf(player)) + var/list/slots = list ( + "backpack" = slot_in_backpack, + "left hand" = slot_l_hand, + "right hand" = slot_r_hand, + ) + for(var/slot in slots) + player.equip_to_slot(gun, slot) + if(gun.loc == player) + break + var/obj/item/weapon/storage/S = locate() in player.contents + if(S && istype(S)) + gun.loc = S /proc/rightandwrong() usr << "You summoned guns!" From d2683a3f0bd84128e427fde364d90b69ac704749 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Fri, 22 Apr 2016 19:21:02 +0100 Subject: [PATCH 2/4] Removes auto-shotty from renegades list --- code/game/antagonist/station/renegade.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/antagonist/station/renegade.dm b/code/game/antagonist/station/renegade.dm index 2a3b498ddc..66229ca58f 100644 --- a/code/game/antagonist/station/renegade.dm +++ b/code/game/antagonist/station/renegade.dm @@ -30,7 +30,6 @@ var/datum/antagonist/renegade/renegades /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/automatic/as24, /obj/item/weapon/gun/projectile/colt/detective, /obj/item/weapon/gun/projectile/sec/wood, /obj/item/weapon/gun/projectile/silenced, From 4eabbcc8d1c19328b4217a675d8dfa92a28903c9 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Wed, 27 Apr 2016 17:32:12 +0100 Subject: [PATCH 3/4] Adjusts the equip proc to be better --- code/game/antagonist/station/renegade.dm | 25 ++++++++++++------------ 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/code/game/antagonist/station/renegade.dm b/code/game/antagonist/station/renegade.dm index 66229ca58f..7100290d87 100644 --- a/code/game/antagonist/station/renegade.dm +++ b/code/game/antagonist/station/renegade.dm @@ -63,20 +63,19 @@ var/datum/antagonist/renegade/renegades 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)) - var/list/slots = list ( - "backpack" = slot_in_backpack, - "left hand" = slot_l_hand, - "right hand" = slot_r_hand, - ) - for(var/slot in slots) - player.equip_to_slot(gun, slot) - if(gun.loc == player) - break - var/obj/item/weapon/storage/S = locate() in player.contents - if(S && istype(S)) - gun.loc = S + + // 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) + /proc/rightandwrong() usr << "You summoned guns!" From 72ece69850e0eefd7941418dadb6bebf3d4460ea Mon Sep 17 00:00:00 2001 From: Yoshax Date: Wed, 27 Apr 2016 23:54:03 +0100 Subject: [PATCH 4/4] Moves double barreled out of the secondary list and into the main --- code/game/antagonist/station/renegade.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/antagonist/station/renegade.dm b/code/game/antagonist/station/renegade.dm index 7100290d87..7c8859e2b4 100644 --- a/code/game/antagonist/station/renegade.dm +++ b/code/game/antagonist/station/renegade.dm @@ -37,7 +37,8 @@ var/datum/antagonist/renegade/renegades /obj/item/weapon/gun/projectile/revolver, /obj/item/weapon/gun/projectile/shotgun/pump, /obj/item/weapon/gun/projectile/shotgun/pump/combat, - list(/obj/item/weapon/gun/projectile/shotgun/doublebarrel, /obj/item/weapon/gun/projectile/shotgun/doublebarrel/pellet, /obj/item/weapon/gun/projectile/shotgun/doublebarrel/sawn), + /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) )