cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 03:27:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5564 from Woodratt/09112018_Mapbugfix

Browse Source 
Map Bugfixes
This commit is contained in:
Anewbe
2018-09-12 21:03:37 -05:00
committed by GitHub
parent 3aca2c38e2 ea200b8318
commit 8094bbd746
7 changed files with 333 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/random/misc.dm
+16 -1
View File
@@ -487,4 +487,19 @@
/obj/item/toy/prize/seraph,
/obj/item/toy/prize/mauler,
/obj/item/toy/prize/odysseus,
/obj/item/toy/prize/phazon)
/obj/item/toy/prize/phazon)
/obj/random/mouseremains
name = "random mouseremains"
desc = "For use with mouse spawners."
icon = 'icons/obj/assemblies/new_assemblies.dmi'
icon_state = "mousetrap"
/obj/random/mouseremains/item_to_spawn()
return pick(/obj/item/device/assembly/mousetrap,
/obj/item/device/assembly/mousetrap/armed,
/obj/effect/decal/cleanable/spiderling_remains,
/obj/effect/decal/cleanable/ash,
/obj/item/weapon/cigbutt,
/obj/item/weapon/cigbutt/cigarbutt,
/obj/effect/decal/remains/mouse)
code/game/objects/random/mob.dm
+13
View File
@@ -186,3 +186,16 @@
prob(5);/mob/living/simple_animal/hostile/hivebot/range/laser,
prob(5);/mob/living/simple_animal/hostile/hivebot/range/strong,
prob(5);/mob/living/simple_animal/hostile/hivebot/range/guard)
//Mice
/obj/random/mob/mouse
name = "Random Mouse"
desc = "This is a random boring maus."
icon_state = "mouse_gray"
/obj/random/mob/mouse/item_to_spawn()
return pick(prob(15);/mob/living/simple_animal/mouse/white,
prob(30);/mob/living/simple_animal/mouse/brown,
prob(30);/mob/living/simple_animal/mouse/gray,
prob(25);/obj/random/mouseremains) //because figuring out how to come up with it picking nothing is beyond my coding ability.