cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 20:17:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-7070

Browse Source
This commit is contained in:
Novacat
2020-05-03 11:37:30 -04:00
committed by GitHub
parent 05eb5c4008 5a8174c025
commit de0bd4181a
116 changed files with 2240 additions and 721 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/random/guns_and_ammo.dm
+133 -1
View File
@@ -400,4 +400,136 @@
/obj/item/weapon/gun/projectile/shotgun/pump/combat,
/obj/item/weapon/storage/box/shotgunammo
)
)
)
// Not strictly a gun, but is used in PoIs to spawn the dropped guns of mercs, or a busted version.
/obj/random/projectile/scrapped_gun
name = "broken gun spawner"
desc = "Spawns a random broken gun, or rarely a fully functional one."
icon = 'icons/obj/gun.dmi'
icon_state = "revolver"
/obj/random/projectile/scrapped_gun/item_to_spawn()
return pickweight(list(
/obj/random/projectile/scrapped_pistol = 10,
/obj/random/projectile/scrapped_smg = 5,
/obj/random/projectile/scrapped_laser = 5,
/obj/random/projectile/scrapped_shotgun = 3,
/obj/random/projectile/scrapped_ionrifle = 3,
/obj/random/projectile/scrapped_bulldog = 1,
/obj/random/projectile/scrapped_flechette = 1,
/obj/random/projectile/scrapped_grenadelauncher = 1,
/obj/random/projectile/scrapped_dartgun = 1
))
/obj/random/projectile/scrapped_shotgun
name = "broken shotgun spawner"
desc = "Loot for PoIs, or their mobs."
icon = 'icons/obj/gun.dmi'
icon_state = "shotgun"
/obj/random/projectile/scrapped_shotgun/item_to_spawn()
return pickweight(list(
/obj/item/weapon/broken_gun/pumpshotgun = 10,
/obj/item/weapon/broken_gun/pumpshotgun_combat = 5,
/obj/item/weapon/gun/projectile/shotgun/pump = 3,
/obj/item/weapon/gun/projectile/shotgun/pump/combat = 1
))
/obj/random/projectile/scrapped_smg
name = "broken smg spawner"
desc = "Loot for PoIs, or their mobs."
icon = 'icons/obj/gun.dmi'
icon_state = "revolver"
/obj/random/projectile/scrapped_smg/item_to_spawn()
return pickweight(list(
/obj/item/weapon/broken_gun/c20r = 10,
/obj/item/weapon/gun/projectile/automatic/c20r = 3
))
/obj/random/projectile/scrapped_pistol
name = "broken pistol spawner"
desc = "Loot for PoIs, or their mobs."
icon = 'icons/obj/gun.dmi'
icon_state = "revolver"
/obj/random/projectile/scrapped_pistol/item_to_spawn()
return pickweight(list(
/obj/item/weapon/broken_gun/silenced45 = 10,
/obj/item/weapon/gun/projectile/silenced = 3
))
/obj/random/projectile/scrapped_laser
name = "broken laser spawner"
desc = "Loot for PoIs, or their mobs."
icon = 'icons/obj/gun.dmi'
icon_state = "revolver"
/obj/random/projectile/scrapped_laser/item_to_spawn()
return pickweight(list(
/obj/item/weapon/broken_gun/laserrifle = 10,
/obj/item/weapon/broken_gun/laser_retro = 5,
/obj/item/weapon/gun/energy/laser = 3,
/obj/item/weapon/gun/energy/retro = 1
))
/obj/random/projectile/scrapped_ionrifle
name = "broken ionrifle spawner"
desc = "Loot for PoIs, or their mobs."
icon = 'icons/obj/gun.dmi'
icon_state = "revolver"
/obj/random/projectile/scrapped_ionrifle/item_to_spawn()
return pickweight(list(
/obj/item/weapon/broken_gun/ionrifle = 10,
/obj/item/weapon/gun/energy/ionrifle = 3
))
/obj/random/projectile/scrapped_bulldog
name = "broken z8 spawner"
desc = "Loot for PoIs, or their mobs."
icon = 'icons/obj/gun.dmi'
icon_state = "revolver"
/obj/random/projectile/scrapped_bulldog/item_to_spawn()
return pickweight(list(
/obj/item/weapon/broken_gun/z8 = 10,
/obj/item/weapon/gun/projectile/automatic/z8 = 3
))
/obj/random/projectile/scrapped_flechette
name = "broken flechette spawner"
desc = "Loot for PoIs, or their mobs."
icon = 'icons/obj/gun.dmi'
icon_state = "revolver"
/obj/random/projectile/scrapped_flechette/item_to_spawn()
return pickweight(list(
/obj/item/weapon/broken_gun/flechette = 10,
/obj/item/weapon/gun/magnetic/railgun/flechette = 3
))
/obj/random/projectile/scrapped_grenadelauncher
name = "broken grenadelauncher spawner"
desc = "Loot for PoIs, or their mobs."
icon = 'icons/obj/gun.dmi'
icon_state = "revolver"
/obj/random/projectile/scrapped_grenadelauncher/item_to_spawn()
return pickweight(list(
/obj/item/weapon/broken_gun/grenadelauncher = 10,
/obj/item/weapon/gun/launcher/grenade = 3
))
/obj/random/projectile/scrapped_dartgun
name = "broken dartgun spawner"
desc = "Loot for PoIs, or their mobs."
icon = 'icons/obj/gun.dmi'
icon_state = "revolver"
/obj/random/projectile/scrapped_dartgun/item_to_spawn()
return pickweight(list(
/obj/item/weapon/broken_gun/dartgun = 10,
/obj/item/weapon/gun/projectile/dartgun = 3
))
code/game/objects/random/misc.dm
+13
View File
@@ -711,3 +711,16 @@
/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/purple,
/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/grey,
/obj/item/weapon/reagent_containers/food/condiment/small/packet/crayon/brown)
/obj/random/thermalponcho
name = "random thermal poncho"
desc = "This is a thermal poncho spawn."
icon = 'icons/obj/clothing/ties.dmi'
icon_state = "classicponcho"
/obj/random/thermalponcho/item_to_spawn()
return pick(prob(5);/obj/item/clothing/accessory/poncho/thermal,
prob(3);/obj/item/clothing/accessory/poncho/thermal/red,
prob(3);/obj/item/clothing/accessory/poncho/thermal/green,
prob(3);/obj/item/clothing/accessory/poncho/thermal/purple,
prob(3);/obj/item/clothing/accessory/poncho/thermal/blue)
code/game/objects/random/mob.dm
+29
View File
@@ -104,6 +104,15 @@
prob(33);/mob/living/simple_mob/animal/giant_spider/frost,
prob(45);/mob/living/simple_mob/animal/sif/shantak)
/obj/random/mob/sif/kururak
name = "Random Kururak"
desc = "This is a random kururak, either waking or hibernating. Will be hostile if more than one are waking."
icon_state = "frost"
/obj/random/mob/sif/kururak/item_to_spawn()
return pick(prob(1);/mob/living/simple_mob/animal/sif/kururak/hibernate,
prob(20);/mob/living/simple_mob/animal/sif/kururak)
/obj/random/mob/spider
name = "Random Spider" //Spiders should patrol where they spawn.
desc = "This is a random boring spider."
@@ -163,6 +172,7 @@
/obj/random/mob/robotic/item_to_spawn() //Hivebots have a total number of 'lots' equal to the lesser drone, at 60.
return pick(prob(60);/mob/living/simple_mob/mechanical/combat_drone/lesser,
prob(50);/mob/living/simple_mob/mechanical/combat_drone,
prob(50);/mob/living/simple_mob/mechanical/mining_drone,
prob(15);/mob/living/simple_mob/mechanical/mecha/ripley,
prob(15);/mob/living/simple_mob/mechanical/mecha/odysseus,
prob(10);/mob/living/simple_mob/mechanical/hivebot,
@@ -174,6 +184,25 @@
prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/strong,
prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/strong/guard)
/obj/random/mob/robotic/drone
name = "Random Drone"
desc = "This is a random drone."
icon_state = "drone_dead"
overwrite_hostility = 1
mob_faction = "malf_drone"
mob_returns_home = 1
mob_wander = 1
mob_wander_distance = 5
mob_hostile = 1
mob_retaliate = 1
/obj/random/mob/robotic/drone/item_to_spawn()
return pick(prob(6);/mob/living/simple_mob/mechanical/combat_drone/lesser,
prob(1);/mob/living/simple_mob/mechanical/combat_drone,
prob(3);/mob/living/simple_mob/mechanical/mining_drone)
/obj/random/mob/robotic/hivebot
name = "Random Hivebot"
desc = "This is a random hivebot."